From: Karel Zak <kzak@redhat.com>
Date: Mon, 3 Aug 2015 09:53:45 +0000 (+0200)
Subject: tests: try mkfs & mount all supported minix versions
X-Git-Tag: v2.27-rc2~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45caf6eea8bf5c9358bd4a5db2320d111107b57e;p=thirdparty%2Futil-linux.git

tests: try mkfs & mount all supported minix versions

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/minix/mkfs b/tests/expected/minix/mkfs
index 592d5dc93d..e69de29bb2 100644
--- a/tests/expected/minix/mkfs
+++ b/tests/expected/minix/mkfs
@@ -1,10 +0,0 @@
-create minix fs
-1728 inodes
-5120 blocks
-Firstdatazone=58 (58)
-Zonesize=1024
-Maxsize=268966912
-
-create mountpoint dir
-mount the filesystem
-umount the image
diff --git a/tests/expected/minix/mkfs-v1c14 b/tests/expected/minix/mkfs-v1c14
new file mode 100644
index 0000000000..cd2fa38c46
--- /dev/null
+++ b/tests/expected/minix/mkfs-v1c14
@@ -0,0 +1,9 @@
+create minix fs -1 -n 14
+3424 inodes
+10224 blocks
+Firstdatazone=112 (112)
+Zonesize=1024
+Maxsize=268966912
+
+mkfs return value: 0
+umount the image
diff --git a/tests/expected/minix/mkfs-v1c30 b/tests/expected/minix/mkfs-v1c30
new file mode 100644
index 0000000000..bbcc3165bf
--- /dev/null
+++ b/tests/expected/minix/mkfs-v1c30
@@ -0,0 +1,9 @@
+create minix fs -1 -n 30
+3424 inodes
+10224 blocks
+Firstdatazone=112 (112)
+Zonesize=1024
+Maxsize=268966912
+
+mkfs return value: 0
+umount the image
diff --git a/tests/expected/minix/mkfs-v2c14 b/tests/expected/minix/mkfs-v2c14
new file mode 100644
index 0000000000..65293b062c
--- /dev/null
+++ b/tests/expected/minix/mkfs-v2c14
@@ -0,0 +1,9 @@
+create minix fs -2 -n 14
+3408 inodes
+10224 blocks
+Firstdatazone=218 (218)
+Zonesize=1024
+Maxsize=2147483647
+
+mkfs return value: 0
+umount the image
diff --git a/tests/expected/minix/mkfs-v2c30 b/tests/expected/minix/mkfs-v2c30
new file mode 100644
index 0000000000..bc76d432da
--- /dev/null
+++ b/tests/expected/minix/mkfs-v2c30
@@ -0,0 +1,9 @@
+create minix fs -2 -n 30
+3408 inodes
+10224 blocks
+Firstdatazone=218 (218)
+Zonesize=1024
+Maxsize=2147483647
+
+mkfs return value: 0
+umount the image
diff --git a/tests/expected/minix/mkfs-v3c60 b/tests/expected/minix/mkfs-v3c60
new file mode 100644
index 0000000000..ef686d9555
--- /dev/null
+++ b/tests/expected/minix/mkfs-v3c60
@@ -0,0 +1,9 @@
+create minix fs -3 -n 60
+3408 inodes
+10224 blocks
+Firstdatazone=218 (218)
+Zonesize=1024
+Maxsize=2147483647
+
+mkfs return value: 0
+umount the image
diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index bbb38e459e..b5a01da0ca 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -21,27 +21,32 @@ TS_DESC="mkfs"
 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 2>&1 >> $TS_OUTPUT
-
-ts_log "create mountpoint dir"
-[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-
-ts_log "mount the filesystem"
-ts_mount "minix" $DEVICE $TS_MOUNTPOINT
-
-# check it
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 
-ts_log "umount the image"
-$TS_CMD_UMOUNT $DEVICE
+ts_scsi_debug_init dev_size_mb=10 num_parts=1
+
+mkfs_and_mount_minix() {
+	ts_init_subtest $1
+	dev=${TS_DEVICE}1
+	ts_log "create minix fs $2"
+	$TS_CMD_MKMINIX $2 $dev >> $TS_OUTPUT 2>&1
+	echo "mkfs return value: $?" >> $TS_OUTPUT
+	udevadm settle
+	[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+	ts_mount "minix" $dev $TS_MOUNTPOINT
+	ts_is_mounted $dev || ts_die "Cannot find $dev in /proc/mounts"
+	ts_log "umount the image"
+	$TS_CMD_UMOUNT $dev
+	ts_finalize_subtest
+}
+
+mkfs_and_mount_minix 'v1c14' '-1 -n 14'
+mkfs_and_mount_minix 'v1c30' '-1 -n 30'
+mkfs_and_mount_minix 'v2c14' '-2 -n 14'
+mkfs_and_mount_minix 'v2c30' '-2 -n 30'
+mkfs_and_mount_minix 'v3c60' '-3 -n 60'
+
+udevadm settle
+rmmod scsi_debug &>/dev/null
 ts_finalize