tests: minix, some corrections and cleanup

 - move generic "check_minix_fs_type" tests to the top
 - add some todos/notes about potential issues
 - add "real" badblocks test (-l)
 - don't check sed's but fsck's return value
 - to see debian bug 773892 we would need "-f"
 - add some more hexdumps

CC: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

4 files changed, 38 insertions, 3 deletions

diff --git a/tests/expected/minix/fsck-images-auto-fix b/tests/expected/minix/fsck-images-auto-fix
index b22c19150..74a648796 100644
--- a/tests/expected/minix/fsck-images-auto-fix
+++ b/tests/expected/minix/fsck-images-auto-fix
@@ -27,7 +27,7 @@ Inode 1 not used, marked used in the bitmap.
 ----------------------------
 FILE SYSTEM HAS BEEN CHANGED
 ----------------------------
-0
+fsck reports changed and uncorrected: 7
 00000000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00000400  10 00 00 00 00 00 01 00  01 00 05 00 00 00 00 00  |................|
diff --git a/tests/expected/minix/fsck-images-badblocks b/tests/expected/minix/fsck-images-badblocks
new file mode 100644
index 000000000..e521e238c
--- /dev/null
+++ b/tests/expected/minix/fsck-images-badblocks
@@ -0,0 +1,35 @@
+32 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=268966912
+
+2 bad blocks
+mkfs return value: 0
+fsck return value: 0
+00000000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00000400  20 00 10 00 01 00 01 00  05 00 00 00 00 1c 08 10  | ...............|
+00000410  8f 13 01 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00000420  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00000800  07 00 00 00 fe ff ff ff  ff ff ff ff ff ff ff ff  |................|
+00000810  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  |................|
+*
+00000c00  33 f0 ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  |3...............|
+00000c10  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  |................|
+*
+00001000  ed 41 00 00 60 00 00 00  34 29 bd 55 00 02 05 00  |.A..`...4).U....|
+00001010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001020  00 80 00 00 00 08 00 00  34 29 bd 55 00 01 08 00  |........4).U....|
+00001030  09 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001040  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00001400  01 00 2e 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001420  01 00 2e 2e 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001440  02 00 2e 62 61 64 62 6c  6f 63 6b 73 00 00 00 00  |...badblocks....|
+00001450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00004000
diff --git a/tests/expected/minix/fsck-images-broken-root b/tests/expected/minix/fsck-images-broken-root
index d851b8312..2c78bdf81 100644
--- a/tests/expected/minix/fsck-images-broken-root
+++ b/tests/expected/minix/fsck-images-broken-root
@@ -4,4 +4,4 @@ Read error: bad block in file '/'
 Read error: bad block in file '/'
 /: bad directory: '..' isn't second
 Inode 1 not used, marked used in the bitmap.
-4
+fsck reports uncorrected: 4
diff --git a/tests/expected/minix/fsck-images-bug.773892 b/tests/expected/minix/fsck-images-bug.773892
index 573541ac9..6e2292787 100644
--- a/tests/expected/minix/fsck-images-bug.773892
+++ b/tests/expected/minix/fsck-images-bug.773892
@@ -1 +1 @@
-0
+fsck reports uncorrected: 4