* [PATCH 1/2] tests: add way to control mkfs.minix time stamps
@ 2015-08-02 18:28 Sami Kerola
2015-08-02 18:29 ` [PATCH 2/2] tests: add fsck.minix checks Sami Kerola
2015-08-03 10:38 ` [PATCH 1/2] tests: add way to control mkfs.minix time stamps Karel Zak
0 siblings, 2 replies; 5+ messages in thread
From: Sami Kerola @ 2015-08-02 18:28 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
Needed in order to create reproducable file systems image files, so that
out come of mkfs.minix can be checksum'ed.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
disk-utils/Makemodule.am | 5 +++++
disk-utils/mkfs.minix.c | 22 ++++++++++++++++++----
tests/commands.sh | 1 +
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 3a2b36d..a2e1994 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -13,6 +13,11 @@ mkfs_minix_SOURCES = \
disk-utils/minix_programs.h \
disk-utils/mkfs.minix.c
mkfs_minix_LDADD = $(LDADD) libcommon.la
+
+check_PROGRAMS += test_mkfs_minix
+test_mkfs_minix_SOURCES = $(mkfs_minix_SOURCES)
+test_mkfs_minix_LDADD = $(mkfs_minix_LDADD)
+test_mkfs_minix_CFLAGS = -DTEST_SCRIPT
endif
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 2da0e68..94ffacb 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -148,6 +148,20 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
exit(out == stderr ? MKFS_EX_USAGE : MKFS_EX_OK);
}
+#ifdef TEST_SCRIPT
+static inline time_t mkfs_minix_time(time_t *t)
+{
+ const char *str = getenv("MKFS_MINIX_TEST_SECOND_SINCE_EPOCH");
+ time_t sec;
+
+ if (str && sscanf(str, "%ld", &sec) == 1)
+ return sec;
+ return time(t);
+}
+#else /* !TEST_SCRIPT */
+# define mkfs_minix_time(x) time(x)
+#endif
+
static void super_set_state(void)
{
switch (fs_version) {
@@ -251,7 +265,7 @@ static void make_bad_inode_v1(struct fs_control *ctl)
return;
mark_inode(MINIX_BAD_INO);
inode->i_nlinks = 1;
- inode->i_time = time(NULL);
+ inode->i_time = mkfs_minix_time(NULL);
inode->i_mode = S_IFREG + 0000;
inode->i_size = ctl->fs_bad_blocks * MINIX_BLOCK_SIZE;
zone = next(0);
@@ -299,7 +313,7 @@ static void make_bad_inode_v2_v3 (struct fs_control *ctl)
return;
mark_inode (MINIX_BAD_INO);
inode->i_nlinks = 1;
- inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL);
+ inode->i_atime = inode->i_mtime = inode->i_ctime = mkfs_minix_time(NULL);
inode->i_mode = S_IFREG + 0000;
inode->i_size = ctl->fs_bad_blocks * MINIX_BLOCK_SIZE;
zone = next (0);
@@ -351,7 +365,7 @@ static void make_root_inode_v1(struct fs_control *ctl) {
mark_inode(MINIX_ROOT_INO);
inode->i_zone[0] = get_free_block(ctl);
inode->i_nlinks = 2;
- inode->i_time = time(NULL);
+ inode->i_time = mkfs_minix_time(NULL);
if (ctl->fs_bad_blocks)
inode->i_size = 3 * ctl->fs_dirsize;
else {
@@ -372,7 +386,7 @@ static void make_root_inode_v2_v3 (struct fs_control *ctl) {
mark_inode (MINIX_ROOT_INO);
inode->i_zone[0] = get_free_block (ctl);
inode->i_nlinks = 2;
- inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL);
+ inode->i_atime = inode->i_mtime = inode->i_ctime = mkfs_minix_time(NULL);
if (ctl->fs_bad_blocks)
inode->i_size = 3 * ctl->fs_dirsize;
diff --git a/tests/commands.sh b/tests/commands.sh
index b5098c8..bb985c7 100644
--- a/tests/commands.sh
+++ b/tests/commands.sh
@@ -22,6 +22,7 @@ TS_HELPER_PYLIBMOUNT_UPDATE="$top_srcdir/libmount/python/test_mount_tab_update.p
TS_HELPER_LOGGER="$top_builddir/test_logger"
TS_HELPER_LOGINDEFS="$top_builddir/test_logindefs"
TS_HELPER_MD5="$top_builddir/test_md5"
+TS_HELPER_MKFS_MINIX="$top_builddir/test_mkfs_minix"
TS_HELPER_MORE=${TS_HELPER_MORE-"$top_builddir/test_more"}
TS_HELPER_PARTITIONS="$top_builddir/sample-partitions"
TS_HELPER_PATHS="$top_builddir/test_pathnames"
--
2.5.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] tests: add fsck.minix checks
2015-08-02 18:28 [PATCH 1/2] tests: add way to control mkfs.minix time stamps Sami Kerola
@ 2015-08-02 18:29 ` Sami Kerola
2015-08-03 10:51 ` Karel Zak
2015-08-07 7:20 ` Ruediger Meier
2015-08-03 10:38 ` [PATCH 1/2] tests: add way to control mkfs.minix time stamps Karel Zak
1 sibling, 2 replies; 5+ messages in thread
From: Sami Kerola @ 2015-08-02 18:29 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
The debian bug was fixed in commit 730ae9c89971, and the rest are about
having test coverity for various file name lenghts and minix fs versions.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
tests/expected/minix/fsck-images-auto-fix | 31 ++++++++++++
tests/expected/minix/fsck-images-broken-root | 7 +++
tests/expected/minix/fsck-images-bug.773892 | 1 +
tests/expected/minix/fsck-images-check-blocks | 9 ++++
tests/expected/minix/fsck-images-v1c14 | 9 ++++
tests/expected/minix/fsck-images-v1c30 | 9 ++++
tests/expected/minix/fsck-images-v2c14 | 9 ++++
tests/expected/minix/fsck-images-v2c30 | 9 ++++
tests/expected/minix/fsck-images-v3c60 | 9 ++++
tests/ts/minix/broken-root | Bin 0 -> 5120 bytes
tests/ts/minix/debian.bug.773892 | Bin 0 -> 16384 bytes
tests/ts/minix/fsck-images | 67 ++++++++++++++++++++++++++
12 files changed, 160 insertions(+)
create mode 100644 tests/expected/minix/fsck-images-auto-fix
create mode 100644 tests/expected/minix/fsck-images-broken-root
create mode 100644 tests/expected/minix/fsck-images-bug.773892
create mode 100644 tests/expected/minix/fsck-images-check-blocks
create mode 100644 tests/expected/minix/fsck-images-v1c14
create mode 100644 tests/expected/minix/fsck-images-v1c30
create mode 100644 tests/expected/minix/fsck-images-v2c14
create mode 100644 tests/expected/minix/fsck-images-v2c30
create mode 100644 tests/expected/minix/fsck-images-v3c60
create mode 100644 tests/ts/minix/broken-root
create mode 100644 tests/ts/minix/debian.bug.773892
create mode 100755 tests/ts/minix/fsck-images
diff --git a/tests/expected/minix/fsck-images-auto-fix b/tests/expected/minix/fsck-images-auto-fix
new file mode 100644
index 0000000..d017dfb
--- /dev/null
+++ b/tests/expected/minix/fsck-images-auto-fix
@@ -0,0 +1,31 @@
+Filesystem auto-fix is dirty, needs checking.
+Read error: bad block in file '/'
+16 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=2147483647
+namelen=60
+
+Read error: bad block in file '/'
+/: bad directory: '.' isn't first
+Read error: bad block in file '/'
+/: bad directory: '..' isn't second
+Inode 1 not used, marked used in the bitmap.
+
+ 0 inodes used (0%)
+ 6 zones used (37%)
+
+ 0 regular files
+ 0 directories
+ 0 character device files
+ 0 block device files
+ 1 links
+ 0 symbolic links
+------
+ 1 files
+----------------------------
+FILE SYSTEM HAS BEEN CHANGED
+----------------------------
+0
+29f0edbcb7e405bbc56e614af3c3cb7c auto-fix
diff --git a/tests/expected/minix/fsck-images-broken-root b/tests/expected/minix/fsck-images-broken-root
new file mode 100644
index 0000000..d851b83
--- /dev/null
+++ b/tests/expected/minix/fsck-images-broken-root
@@ -0,0 +1,7 @@
+Read error: bad block in file '/'
+Read error: bad block in file '/'
+/: bad directory: '.' isn't first
+Read error: bad block in file '/'
+/: bad directory: '..' isn't second
+Inode 1 not used, marked used in the bitmap.
+4
diff --git a/tests/expected/minix/fsck-images-bug.773892 b/tests/expected/minix/fsck-images-bug.773892
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/tests/expected/minix/fsck-images-bug.773892
@@ -0,0 +1 @@
+0
diff --git a/tests/expected/minix/fsck-images-check-blocks b/tests/expected/minix/fsck-images-check-blocks
new file mode 100644
index 0000000..c255d2b
--- /dev/null
+++ b/tests/expected/minix/fsck-images-check-blocks
@@ -0,0 +1,9 @@
+32 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=268966912
+
+mkfs return value: 0
+fsck return value: 0
+a00e2f45adc97da6ccb5aade7b129b42
diff --git a/tests/expected/minix/fsck-images-v1c14 b/tests/expected/minix/fsck-images-v1c14
new file mode 100644
index 0000000..519fc7e
--- /dev/null
+++ b/tests/expected/minix/fsck-images-v1c14
@@ -0,0 +1,9 @@
+32 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=268966912
+
+mkfs return value: 0
+fsck return value: 0
+9d9bf9d22274bb996938812ab01dd891
diff --git a/tests/expected/minix/fsck-images-v1c30 b/tests/expected/minix/fsck-images-v1c30
new file mode 100644
index 0000000..c255d2b
--- /dev/null
+++ b/tests/expected/minix/fsck-images-v1c30
@@ -0,0 +1,9 @@
+32 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=268966912
+
+mkfs return value: 0
+fsck return value: 0
+a00e2f45adc97da6ccb5aade7b129b42
diff --git a/tests/expected/minix/fsck-images-v2c14 b/tests/expected/minix/fsck-images-v2c14
new file mode 100644
index 0000000..2b3a173
--- /dev/null
+++ b/tests/expected/minix/fsck-images-v2c14
@@ -0,0 +1,9 @@
+16 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=2147483647
+
+mkfs return value: 0
+fsck return value: 0
+d836636da820de16325370caf494cdab
diff --git a/tests/expected/minix/fsck-images-v2c30 b/tests/expected/minix/fsck-images-v2c30
new file mode 100644
index 0000000..168e66a
--- /dev/null
+++ b/tests/expected/minix/fsck-images-v2c30
@@ -0,0 +1,9 @@
+16 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=2147483647
+
+mkfs return value: 0
+fsck return value: 0
+3e5796ddbd8d08b98c29c42199685bcb
diff --git a/tests/expected/minix/fsck-images-v3c60 b/tests/expected/minix/fsck-images-v3c60
new file mode 100644
index 0000000..4505dcd
--- /dev/null
+++ b/tests/expected/minix/fsck-images-v3c60
@@ -0,0 +1,9 @@
+16 inodes
+16 blocks
+Firstdatazone=5 (5)
+Zonesize=1024
+Maxsize=2147483647
+
+mkfs return value: 0
+fsck return value: 0
+e4acad302d186a5c8788acedb7021255
diff --git a/tests/ts/minix/broken-root b/tests/ts/minix/broken-root
new file mode 100644
index 0000000000000000000000000000000000000000..37ee84e0c5913154271a0a008932d6f4d207948c
GIT binary patch
literal 5120
zcmZQz7zLvtFd70QH3S5}9%p1=WMBoe{{R194-$*=1rjV^p;2Nq1V%$(n1%o|!#`k_
z9|fZ!Fd70QF$9=Dj6`3L`gt@2MneD;0&g9e7+x^HU~T}mZ)Vu;425AxZ(x`<dPco9
L8Umvs01g2Fn^FSw
literal 0
HcmV?d00001
diff --git a/tests/ts/minix/debian.bug.773892 b/tests/ts/minix/debian.bug.773892
new file mode 100644
index 0000000000000000000000000000000000000000..db9784887a264b991f7281ddf55123b6e9ca85c3
GIT binary patch
literal 16384
zcmeI#u?@m75J1s05fWu2S_(S4%s_Tv0YW;EC>VqR*n!QED5!yi0n$+3vrAi+{;SRr
z76AfT1=dkV8TNbxSS{-7vSg*uO(2~>H59);76Aeo1*&JpYRv=)i~^7LRkp(n&~9$K
ze)jtXq?>^R6UZu1qM1xDai6{rO}Fp6)A?|`Og`k0009C72oNAZfB*pk1PBlyK!5-N
h0t5&UAV7cs0RjXF5FkK+009C72oNAZfB=EN1-|D^{dWKW
literal 0
HcmV?d00001
diff --git a/tests/ts/minix/fsck-images b/tests/ts/minix/fsck-images
new file mode 100755
index 0000000..afd2f9b
--- /dev/null
+++ b/tests/ts/minix/fsck-images
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+TS_TOPDIR="${0%/*}/../.."
+TS_DESC="fsck images"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+ts_check_test_command "$TS_CMD_FSCKMINIX"
+ts_check_test_command "$TS_HELPER_MKFS_MINIX"
+
+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
+ echo "mkfs return value: $?" >> $TS_OUTPUT
+ $TS_CMD_FSCKMINIX $TS_OUTDIR/$1 >> $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
+ ts_finalize_subtest
+}
+
+check_minix_fs_type 'v1c14' '-1 -n 14'
+check_minix_fs_type 'v1c30' '-1 -n 30'
+check_minix_fs_type 'v2c14' '-2 -n 14'
+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
+echo $? >> $TS_OUTPUT
+md5sum "$TS_OUTDIR/auto-fix" |
+ sed 's/ .*auto-fix/ auto-fix/' >> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "bug.773892"
+"$TS_CMD_FSCKMINIX" "$TS_SELF/debian.bug.773892" > $TS_OUTPUT 2>&1
+echo $? >> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "broken-root"
+"$TS_CMD_FSCKMINIX" "$TS_SELF/broken-root" > $TS_OUTPUT 2>&1
+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
+
+ts_finalize
--
2.5.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] tests: add way to control mkfs.minix time stamps
2015-08-02 18:28 [PATCH 1/2] tests: add way to control mkfs.minix time stamps Sami Kerola
2015-08-02 18:29 ` [PATCH 2/2] tests: add fsck.minix checks Sami Kerola
@ 2015-08-03 10:38 ` Karel Zak
1 sibling, 0 replies; 5+ messages in thread
From: Karel Zak @ 2015-08-03 10:38 UTC (permalink / raw)
To: Sami Kerola; +Cc: util-linux
On Sun, Aug 02, 2015 at 07:28:59PM +0100, Sami Kerola wrote:
> disk-utils/Makemodule.am | 5 +++++
> disk-utils/mkfs.minix.c | 22 ++++++++++++++++++----
> tests/commands.sh | 1 +
> 3 files changed, 24 insertions(+), 4 deletions(-)
Applied, thanks.
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] tests: add fsck.minix checks
2015-08-02 18:29 ` [PATCH 2/2] tests: add fsck.minix checks Sami Kerola
@ 2015-08-03 10:51 ` Karel Zak
2015-08-07 7:20 ` Ruediger Meier
1 sibling, 0 replies; 5+ messages in thread
From: Karel Zak @ 2015-08-03 10:51 UTC (permalink / raw)
To: Sami Kerola; +Cc: util-linux
On Sun, Aug 02, 2015 at 07:29:00PM +0100, Sami Kerola wrote:
> tests/expected/minix/fsck-images-auto-fix | 31 ++++++++++++
> tests/expected/minix/fsck-images-broken-root | 7 +++
> tests/expected/minix/fsck-images-bug.773892 | 1 +
> tests/expected/minix/fsck-images-check-blocks | 9 ++++
> tests/expected/minix/fsck-images-v1c14 | 9 ++++
> tests/expected/minix/fsck-images-v1c30 | 9 ++++
> tests/expected/minix/fsck-images-v2c14 | 9 ++++
> tests/expected/minix/fsck-images-v2c30 | 9 ++++
> tests/expected/minix/fsck-images-v3c60 | 9 ++++
> tests/ts/minix/broken-root | Bin 0 -> 5120 bytes
> tests/ts/minix/debian.bug.773892 | Bin 0 -> 16384 bytes
> tests/ts/minix/fsck-images | 67 ++++++++++++++++++++++++++
Applied, thanks.
> +ts_check_test_command "$TS_CMD_FSCKMINIX"
> +ts_check_test_command "$TS_HELPER_MKFS_MINIX"
> +
> +export MKFS_MINIX_TEST_SECOND_SINCE_EPOCH='1438460212'
You forgot that the filesystem inodes also contains UID and GIT and
mkfs.minix uses getuid()... so the final checksum depends on used
account :-)
Fixed, I have updated the checksums and enabled the tests for root
(UID=0) only.
> +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_OUTDIR/$1 is outside subtest namespace, fixed to use ${TS_OUTPUT}.img
> +echo "42" > $TS_OUTDIR/badlist
> +check_minix_fs_type 'check-blocks' "-l $TS_OUTDIR/badlist -c"
> +rm -f $TS_OUTDIR/badlist
same here. Fixed.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] tests: add fsck.minix checks
2015-08-02 18:29 ` [PATCH 2/2] tests: add fsck.minix checks Sami Kerola
2015-08-03 10:51 ` Karel Zak
@ 2015-08-07 7:20 ` Ruediger Meier
1 sibling, 0 replies; 5+ messages in thread
From: Ruediger Meier @ 2015-08-07 7:20 UTC (permalink / raw)
To: Sami Kerola; +Cc: util-linux
On Sunday 02 August 2015, Sami Kerola wrote:
> The debian bug was fixed in commit 730ae9c89971, and the rest are
> about having test coverity for various file name lenghts and minix fs
> versions.
>
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
> tests/expected/minix/fsck-images-auto-fix | 31 ++++++++++++
> tests/expected/minix/fsck-images-broken-root | 7 +++
> tests/expected/minix/fsck-images-bug.773892 | 1 +
> tests/expected/minix/fsck-images-check-blocks | 9 ++++
> tests/expected/minix/fsck-images-v1c14 | 9 ++++
> tests/expected/minix/fsck-images-v1c30 | 9 ++++
> tests/expected/minix/fsck-images-v2c14 | 9 ++++
> tests/expected/minix/fsck-images-v2c30 | 9 ++++
> tests/expected/minix/fsck-images-v3c60 | 9 ++++
> tests/ts/minix/broken-root | Bin 0 -> 5120 bytes
> tests/ts/minix/debian.bug.773892 | Bin 0 -> 16384 bytes
> tests/ts/minix/fsck-images | 67
> ++++++++++++++++++++++++++ 12 files changed, 160 insertions(+)
> create mode 100644 tests/expected/minix/fsck-images-auto-fix
> create mode 100644 tests/expected/minix/fsck-images-broken-root
> create mode 100644 tests/expected/minix/fsck-images-bug.773892
> create mode 100644 tests/expected/minix/fsck-images-check-blocks
> create mode 100644 tests/expected/minix/fsck-images-v1c14
> create mode 100644 tests/expected/minix/fsck-images-v1c30
> create mode 100644 tests/expected/minix/fsck-images-v2c14
> create mode 100644 tests/expected/minix/fsck-images-v2c30
> create mode 100644 tests/expected/minix/fsck-images-v3c60
> create mode 100644 tests/ts/minix/broken-root
> create mode 100644 tests/ts/minix/debian.bug.773892
> create mode 100755 tests/ts/minix/fsck-images
These tests fail on big endian systems, see below. We could fix most of them by
adding BE md5sum like we did for other tests. Unfortunately I don't have time to
do that before 2.27.
BTW I think a better solution would be to compare hexdumps instead of md5sums
anyway. Maybe it's possible to write a shell function which produces
"endianess-invariant hexdumps" of minix images?
Test failures:
minix: mkfs checksums ... OK
minix: fsck images ...
: v1c14 ... FAILED (minix/fsck-images-v1c14)
: v1c30 ... FAILED (minix/fsck-images-v1c30)
: v2c14 ... FAILED (minix/fsck-images-v2c14)
: v2c30 ... FAILED (minix/fsck-images-v2c30)
: v3c60 ... FAILED (minix/fsck-images-v3c60)
: auto-fix ...fsck.minix from util-linux 2.27.rc1-45-41e55
bad magic number in super-block
FAILED (minix/fsck-images-auto-fix)
: bug.773892 ... FAILED (minix/fsck-images-bug.773892)
: broken-root ... FAILED (minix/fsck-images-broken-root)
: check-blocks ... FAILED (minix/fsck-images-check-blocks)
... FAILED (9 from 9 sub-tests)
minix: mkfs ...
: v1c14 ... OK
: v1c30 ... OK
: v2c14 ... OK
: v2c30 ... OK
: v3c60 ... OK
... OK (all 5 sub-tests PASSED)
[...]
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-auto-fix 2015-08-06 21:28:12.906048709 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-auto-fix 2015-08-06 21:45:54.950000003 +0000
@@ -1,31 +1,2 @@
-Filesystem auto-fix is dirty, needs checking.
-Read error: bad block in file '/'
-16 inodes
-16 blocks
-Firstdatazone=5 (5)
-Zonesize=1024
-Maxsize=2147483647
-namelen=60
-
-Read error: bad block in file '/'
-/: bad directory: '.' isn't first
-Read error: bad block in file '/'
-/: bad directory: '..' isn't second
-Inode 1 not used, marked used in the bitmap.
-
- 0 inodes used (0%)
- 6 zones used (37%)
-
- 0 regular files
- 0 directories
- 0 character device files
- 0 block device files
- 1 links
- 0 symbolic links
-------
- 1 files
-----------------------------
-FILE SYSTEM HAS BEEN CHANGED
-----------------------------
0
-29f0edbcb7e405bbc56e614af3c3cb7c auto-fix.img
+346e041d9a762fc6be2feb97904c1a4a auto-fix.img
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-broken-root 2015-08-06 21:28:12.906048709 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-broken-root 2015-08-06 21:45:55.090000003 +0000
@@ -1,7 +1,3 @@
-Read error: bad block in file '/'
-Read error: bad block in file '/'
-/: bad directory: '.' isn't first
-Read error: bad block in file '/'
-/: bad directory: '..' isn't second
-Inode 1 not used, marked used in the bitmap.
-4
+fsck.minix from util-linux 2.27.rc1-45-41e55
+bad magic number in super-block
+8
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-bug.773892 2015-08-06 21:28:12.917048708 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-bug.773892 2015-08-06 21:45:55.020000003 +0000
@@ -1 +1,3 @@
-0
+fsck.minix from util-linux 2.27.rc1-45-41e55
+bad magic number in super-block
+8
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-check-blocks 2015-08-06 21:28:12.917048708 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-check-blocks 2015-08-06 21:45:55.180000003 +0000
@@ -6,4 +6,4 @@
mkfs return value: 0
fsck return value: 0
-9336eb47979f61e934c3aec3434333d7
+ffa06ab882e916a42abea58342256830
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-v1c14 2015-08-06 21:28:12.917048708 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-v1c14 2015-08-06 21:45:54.650000003 +0000
@@ -6,4 +6,4 @@
mkfs return value: 0
fsck return value: 0
-663e1fb18fc074fc15bdb698b0fd0fda
+c9122b1cbfc311669752aef8fc94cd7b
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-v1c30 2015-08-06 21:28:12.917048708 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-v1c30 2015-08-06 21:45:54.700000003 +0000
@@ -6,4 +6,4 @@
mkfs return value: 0
fsck return value: 0
-9336eb47979f61e934c3aec3434333d7
+ffa06ab882e916a42abea58342256830
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-v2c14 2015-08-06 21:28:12.917048708 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-v2c14 2015-08-06 21:45:54.780000003 +0000
@@ -6,4 +6,4 @@
mkfs return value: 0
fsck return value: 0
-acfd4cae9ccfc3bc1a12d3c4a39f95c9
+3059480cac68cf9dfadff824fbddf435
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-v2c30 2015-08-06 21:28:12.917048708 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-v2c30 2015-08-06 21:45:54.840000003 +0000
@@ -6,4 +6,4 @@
mkfs return value: 0
fsck return value: 0
-1277a1e3a3cefa6afc63a9e38e4cfdf8
+ed40ea6abe47d1e26f7039bf8c044075
--- /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/expected/minix/fsck-images-v3c60 2015-08-06 21:28:12.917048708 +0000
+++ /home/abuild/rpmbuild/BUILD/util-linux-2.27.rc1.git45.41e55/tests/output/minix/fsck-images-v3c60 2015-08-06 21:45:54.900000003 +0000
@@ -5,5 +5,8 @@
Maxsize=2147483647
mkfs return value: 0
-fsck return value: 0
-ca57b3604ed9476108ac41d1bdb1e1d5
+/: bad directory: '.' isn't first
+/: bad directory: '..' isn't second
+Inode 1 not used, marked used in the bitmap.
+fsck return value: 4
+907a34f3659b546a87ce10580c8f53cb
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-08-07 7:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-02 18:28 [PATCH 1/2] tests: add way to control mkfs.minix time stamps Sami Kerola
2015-08-02 18:29 ` [PATCH 2/2] tests: add fsck.minix checks Sami Kerola
2015-08-03 10:51 ` Karel Zak
2015-08-07 7:20 ` Ruediger Meier
2015-08-03 10:38 ` [PATCH 1/2] tests: add way to control mkfs.minix time stamps Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox