diff options
| author | Karel Zak | 2015-08-03 12:51:13 +0200 |
|---|---|---|
| committer | Karel Zak | 2015-08-03 12:51:13 +0200 |
| commit | dc5c91f648adb0505d435a52335fadbb8c308ffe (patch) | |
| tree | e9260fb650abbb9cb98a21081d84c910bb36033f | |
| parent | tests: try mkfs & mount all supported minix versions (diff) | |
| download | kernel-qcow2-util-linux-dc5c91f648adb0505d435a52335fadbb8c308ffe.tar.gz kernel-qcow2-util-linux-dc5c91f648adb0505d435a52335fadbb8c308ffe.tar.xz kernel-qcow2-util-linux-dc5c91f648adb0505d435a52335fadbb8c308ffe.zip | |
tests: fix minix tests filenames
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | tests/expected/minix/fsck-images-auto-fix | 2 | ||||
| -rwxr-xr-x | tests/ts/minix/fsck-images | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/tests/expected/minix/fsck-images-auto-fix b/tests/expected/minix/fsck-images-auto-fix index d017dfbf2..9680daaea 100644 --- 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 e0b42344b..cb0a9e3fd 100755 --- 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 |