tests: minix, add a useful non-root check

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

2 files changed, 32 insertions, 15 deletions

diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck
index b57b20ec3..21fbde808 100755
--- a/tests/ts/minix/fsck
+++ b/tests/ts/minix/fsck
@@ -15,25 +15,42 @@
 # GNU General Public License for more details.
 #
 TS_TOPDIR="${0%/*}/../.."
-TS_DESC="mkfs checksums"
+TS_DESC="mkfs fsck"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MKMINIX"
-
-ts_skip_nonroot
-ts_check_losetup
-
-IMAGE="$TS_OUTDIR/${TS_TESTNAME}-loop.img"
-ts_device_init
-DEVICE=$TS_LODEV
-
-ts_log "create minix fs"
-$TS_CMD_MKMINIX $DEVICE >> $TS_OUTPUT 2>&1
-
-ts_log "fsck minix fs"
-$TS_CMD_FSCKMINIX $DEVICE >> $TS_OUTPUT 2>&1
+ts_check_test_command "$TS_CMD_FSCKMINIX"
+
+mkfs_and_fsck_minix() {
+	local ret
+	ts_log "#####################################"
+	ts_log "$ mkfs.minix $1 image"
+	$TS_CMD_MKMINIX $1 $img >> $TS_OUTPUT 2>&1
+	ret=$?
+	echo "return mkfs: $ret" >> $TS_OUTPUT
+	test $ret = 0 || return $ret
+
+	ts_log "$ fsck.minix -lavsf image"
+	$TS_CMD_FSCKMINIX -lavsf $img >> $TS_OUTPUT 2>&1
+	ret=$?
+	echo "return fsck: $ret" >> $TS_OUTPUT
+	return $ret
+}
+
+img=$(ts_image_init)
+
+# TODO looping over arbitrary badblock files (-l bad) gives a lot segfaults
+for ver in "" "-1" "-2" "-3"; do
+for n in "" "-n 14" "-n 30" "-n 60"; do
+	mkfs_and_fsck_minix "$ver $n"
+done
+done
+
+rm -f $img
+
+sed -i "s@$img@image@g" $TS_OUTPUT
 
 ts_finalize
 
diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index b5a01da0c..3f0f83f06 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 TS_TOPDIR="${0%/*}/../.."
-TS_DESC="mkfs"
+TS_DESC="mkfs mount"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"