From 2f9549470754a958a8151e000ee881f84015634c Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Thu, 15 May 2014 13:20:31 +0200
Subject: tests, add function ts_mount

We want to generalize mounts similar to how we do it already in
minix/mkfs. Currently most of our other checks just fail if
"fs not supported".

Note that the new function checks a bit stronger than before in
minix/mkfs. It respects mount's return value and stderr goes
to $TS_OUTPUT too.

It's a bit ugly that we write to $TS_OUTPUT from inside of the
function. But if the caller would do it then we couldn't
ts_skip and the whole function would be pointless.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/functions.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'tests/functions.sh')

diff --git a/tests/functions.sh b/tests/functions.sh
index 3888f0dcd..a1ed3ad22 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -491,6 +491,22 @@ function ts_device_has_uuid {
 	return $?
 }
 
+function ts_mount {
+	local out
+	local result
+	local msg
+
+	out=$($TS_CMD_MOUNT "$@" 2>&1)
+	result=$?
+	echo -n "$out" >> $TS_OUTPUT
+
+	if [ $result != 0 ]; then
+		msg=$(echo "$out" | grep -m1 "unknown filesystem type") \
+			&& ts_skip "$msg"
+	fi
+	return $result
+}
+
 function ts_is_mounted {
 	local DEV=$(ts_canonicalize "$1")
 
-- 
cgit v1.2.3-55-g7522