tests: fix minix tests filenames

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

diff --git a/tests/expected/minix/fsck-images-auto-fix b/tests/expected/minix/fsck-images-auto-fix
index d017dfbf29fd481978cc5115334a1badeef1ba80..9680daaea56be024aa94eae0a12f6fb40fd3cc81 100644 (file)
--- a/tests/expected/minix/fsck-images-auto-fix
+++ b/tests/expected/minix/fsck-images-auto-fix
@@ -28,4 +28,4 @@ Inode 1 not used, marked used in the bitmap.
 FILE SYSTEM HAS BEEN CHANGED
 ----------------------------
 0
-29f0edbcb7e405bbc56e614af3c3cb7c auto-fix
+29f0edbcb7e405bbc56e614af3c3cb7c auto-fix.img

diff --git a/tests/ts/minix/fsck-images b/tests/ts/minix/fsck-images
index e0b42344b380e73436a5d625b7e4baeb967d0563..cb0a9e3fd14d8baeaf65b028e8febb6eb3b9c329 100755 (executable)
--- a/tests/ts/minix/fsck-images
+++ b/tests/ts/minix/fsck-images
@@ -46,12 +46,12 @@ check_minix_fs_type 'v2c30' '-2 -n 30'
 check_minix_fs_type 'v3c60' '-3 -n 60'
 
 ts_init_subtest "auto-fix"
-cp "$TS_SELF/broken-root" "$TS_OUTDIR/auto-fix"
-"$TS_CMD_FSCKMINIX" -sav "$TS_OUTDIR/auto-fix" |
-       sed 's/Filesystem on .*auto-fix is dirty/Filesystem auto-fix is dirty/' > $TS_OUTPUT 2>&1
+img=${TS_OUTPUT}.img
+cp "$TS_SELF/broken-root" $img
+"$TS_CMD_FSCKMINIX" -sav $img |
+       sed 's/Filesystem on .* is dirty/Filesystem auto-fix is dirty/' > $TS_OUTPUT 2>&1
 echo $? >> $TS_OUTPUT
-md5sum "$TS_OUTDIR/auto-fix" |
-       sed 's/  .*auto-fix/ auto-fix/' >> $TS_OUTPUT
+md5sum $img | sed 's/  .*auto-fix/ auto-fix/' >> $TS_OUTPUT
 ts_finalize_subtest
 
 ts_init_subtest "bug.773892"
@@ -64,8 +64,9 @@ ts_init_subtest "broken-root"
 echo $? >> $TS_OUTPUT
 ts_finalize_subtest
 
-echo "42" > $TS_OUTDIR/badlist
-check_minix_fs_type 'check-blocks' "-l $TS_OUTDIR/badlist -c"
-rm -f $TS_OUTDIR/badlist
+img="$TS_OUTDIR/${TS_TESTNAME}.badlist"
+echo "42" > $img
+check_minix_fs_type 'check-blocks' "-l $img -c"
+rm -f $img
 
 ts_finalize