From: Milan Broz <mbroz@redhat.com>
Date: Fri, 5 Oct 2012 16:37:39 +0000 (+0200)
Subject: tests: ignore test if kernel doesn't support minix fs
X-Git-Tag: v2.23-rc1~648
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53ebc440fc2c470e98d835f1e193e344bcc62c21;p=thirdparty%2Futil-linux.git

tests: ignore test if kernel doesn't support minix fs

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>
---

diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index 93de4e6ea8..39185ad811 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -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