]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
tests: ignore test if kernel doesn't support minix fs
authorMilan Broz <mbroz@redhat.com>
Fri, 5 Oct 2012 16:37:39 +0000 (18:37 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 9 Oct 2012 10:12:49 +0000 (12:12 +0200)
Minix mount test returs failure if kernel have no minix support,
 minix: mkfs ... FAILED (minix/mkfs)
ignore test result instead in this case.

Signed-off-by: Milan Broz <mbroz@redhat.com>
tests/ts/minix/mkfs

index 93de4e6ea87716738e1d1c7bdd7df4b079fffe50..39185ad8117a93e2dacd1442042548129833280e 100755 (executable)
@@ -35,7 +35,8 @@ ts_log "create mountpoint dir"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_log "mount the filesystem"
-$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
+($TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT || true) \
+        | grep -q "unknown filesystem type" && ts_skip "mkfs: minix fs not supported by kernel"
 
 # check it
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE