From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 15 May 2014 14:56:18 +0000 (+0200)
Subject: tests: ts_mount knows which fs is expected
X-Git-Tag: v2.25-rc1~127^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2cc2ba722d5fd0775855bf6ae977bb66a31c09c;p=thirdparty%2Futil-linux.git

tests: ts_mount knows which fs is expected

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/tests/functions.sh b/tests/functions.sh
index cc3dc054aa..384fccdc86 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -496,6 +496,8 @@ function ts_mount {
 	local result
 	local msg
 	local fs
+	local fs_exp=$1
+	shift
 
 	out=$($TS_CMD_MOUNT "$@" 2>&1)
 	result=$?
@@ -506,7 +508,7 @@ function ts_mount {
 	then
 		# skip only if reported fs correctly and if it's not available
 		fs=$(echo "$msg" | sed -n "s/.*type '\(.*\)'$/\1/p")
-		[ -n "$fs" ] \
+		[ "$fs" = "fs_exp" ] \
 		 && grep -qe "[[:space:]]${fs}$" /proc/filesystems &>/dev/null \
 		 || ts_skip "$msg"
 	fi
diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index f664e35259..86230f77ce 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -37,7 +37,7 @@ ts_log "create mountpoint dir"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_log "mount the filesystem"
-ts_mount $DEVICE $TS_MOUNTPOINT
+ts_mount "minix" $DEVICE $TS_MOUNTPOINT
 
 # check it
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE