tests: fix minix test

- run the test with UID=0 only. The minix FS inode contains UID and
  GID, so the final image checksum depends on user...

- always use subtest name for the images

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

diff --git a/tests/expected/minix/fsck-images-check-blocks b/tests/expected/minix/fsck-images-check-blocks
index c255d2b87e8a18d9a8977ace8d0f5a3aade51ff6..a5549fa8af065a3cd19d506695f0e90635d02476 100644 (file)
--- a/tests/expected/minix/fsck-images-check-blocks
+++ b/tests/expected/minix/fsck-images-check-blocks
@@ -6,4 +6,4 @@ Maxsize=268966912
 
 mkfs return value: 0
 fsck return value: 0
-a00e2f45adc97da6ccb5aade7b129b42
+9336eb47979f61e934c3aec3434333d7

diff --git a/tests/expected/minix/fsck-images-v1c14 b/tests/expected/minix/fsck-images-v1c14
index 519fc7e3ce1f2be26211c4eda6e21a295243620b..3db2ace357fb7e2040e433894a3e53b45818d048 100644 (file)
--- a/tests/expected/minix/fsck-images-v1c14
+++ b/tests/expected/minix/fsck-images-v1c14
@@ -6,4 +6,4 @@ Maxsize=268966912
 
 mkfs return value: 0
 fsck return value: 0
-9d9bf9d22274bb996938812ab01dd891
+663e1fb18fc074fc15bdb698b0fd0fda

diff --git a/tests/expected/minix/fsck-images-v1c30 b/tests/expected/minix/fsck-images-v1c30
index c255d2b87e8a18d9a8977ace8d0f5a3aade51ff6..a5549fa8af065a3cd19d506695f0e90635d02476 100644 (file)
--- a/tests/expected/minix/fsck-images-v1c30
+++ b/tests/expected/minix/fsck-images-v1c30
@@ -6,4 +6,4 @@ Maxsize=268966912
 
 mkfs return value: 0
 fsck return value: 0
-a00e2f45adc97da6ccb5aade7b129b42
+9336eb47979f61e934c3aec3434333d7

diff --git a/tests/expected/minix/fsck-images-v2c14 b/tests/expected/minix/fsck-images-v2c14
index 2b3a1739e6df492758d22757cd6d82144dfb5e9b..978e8ef8940c9c267f11daff4db26d40fd047f40 100644 (file)
--- a/tests/expected/minix/fsck-images-v2c14
+++ b/tests/expected/minix/fsck-images-v2c14
@@ -6,4 +6,4 @@ Maxsize=2147483647
 
 mkfs return value: 0
 fsck return value: 0
-d836636da820de16325370caf494cdab
+acfd4cae9ccfc3bc1a12d3c4a39f95c9

diff --git a/tests/expected/minix/fsck-images-v2c30 b/tests/expected/minix/fsck-images-v2c30
index 168e66a8fd43380c8a9df9ceb7fb5b171477848a..b3795a5afc79f19a1e94dcf5b406749968015495 100644 (file)
--- a/tests/expected/minix/fsck-images-v2c30
+++ b/tests/expected/minix/fsck-images-v2c30
@@ -6,4 +6,4 @@ Maxsize=2147483647
 
 mkfs return value: 0
 fsck return value: 0
-3e5796ddbd8d08b98c29c42199685bcb
+1277a1e3a3cefa6afc63a9e38e4cfdf8

diff --git a/tests/expected/minix/fsck-images-v3c60 b/tests/expected/minix/fsck-images-v3c60
index 4505dcde854234759394a55e0b201bb9c8fcb19f..cfb9b83b565260de1a2e7cc6b8f01970c51ac3f3 100644 (file)
--- a/tests/expected/minix/fsck-images-v3c60
+++ b/tests/expected/minix/fsck-images-v3c60
@@ -6,4 +6,4 @@ Maxsize=2147483647
 
 mkfs return value: 0
 fsck return value: 0
-e4acad302d186a5c8788acedb7021255
+ca57b3604ed9476108ac41d1bdb1e1d5

diff --git a/tests/ts/minix/fsck-images b/tests/ts/minix/fsck-images
index afd2f9b48a56b163af5cfab82d9f9e1200149b7b..e0b42344b380e73436a5d625b7e4baeb967d0563 100755 (executable)
--- a/tests/ts/minix/fsck-images
+++ b/tests/ts/minix/fsck-images
@@ -18,6 +18,9 @@ TS_DESC="fsck images"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+# inode contains UID and GID, use always UID=0 to get the same checksum
+ts_skip_nonroot
+
 ts_check_test_command "$TS_CMD_FSCKMINIX"
 ts_check_test_command "$TS_HELPER_MKFS_MINIX"
 
@@ -25,13 +28,14 @@ export MKFS_MINIX_TEST_SECOND_SINCE_EPOCH='1438460212'
 
 check_minix_fs_type() {
        ts_init_subtest $1
-       dd if=/dev/zero bs=1024 count=16 of=$TS_OUTDIR/$1 >/dev/null 2>&1
-       $TS_HELPER_MKFS_MINIX $2 $TS_OUTDIR/$1 >> $TS_OUTPUT 2>&1
+       img=${TS_OUTPUT}.img
+       dd if=/dev/zero bs=1024 count=16 of=$img >/dev/null 2>&1
+       $TS_HELPER_MKFS_MINIX $2 $img >> $TS_OUTPUT 2>&1
        echo "mkfs return value: $?" >> $TS_OUTPUT
-       $TS_CMD_FSCKMINIX $TS_OUTDIR/$1 >> $TS_OUTPUT 2>&1
+       $TS_CMD_FSCKMINIX $img >> $TS_OUTPUT 2>&1
        echo "fsck return value: $?" >> $TS_OUTPUT
-       md5sum $TS_OUTDIR/$1 | awk '{print $1}' >> $TS_OUTPUT 2>&1
-       rm -f $TS_OUTDIR/$1
+       md5sum $img | awk '{print $1}' >> $TS_OUTPUT 2>&1
+       rm -f $img
        ts_finalize_subtest
 }