From: Theodore Ts'o Date: Sun, 13 Oct 2013 02:25:29 +0000 (-0400) Subject: tests: remove version number dependency in r_min_itable X-Git-Tag: v1.42.9~124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=128c943ef2a0a82b8a4a8a9ca66f459e107bc877;p=thirdparty%2Fe2fsprogs.git tests: remove version number dependency in r_min_itable Signed-off-by: "Theodore Ts'o" --- diff --git a/tests/r_min_itable/expect b/tests/r_min_itable/expect index 104688a1f..ddb5a377b 100644 --- a/tests/r_min_itable/expect +++ b/tests/r_min_itable/expect @@ -4,7 +4,7 @@ Resizing the filesystem on test.img to 1124 (1k) blocks. The filesystem on test.img is now 1124 blocks long. Exit status is 0 -e2fsck 1.42.8 (20-Jun-2013) +fsck -yf -N test_filesys test.img Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity diff --git a/tests/r_min_itable/script b/tests/r_min_itable/script index 00aaa60e3..281fd5a62 100644 --- a/tests/r_min_itable/script +++ b/tests/r_min_itable/script @@ -13,11 +13,13 @@ echo "resize2fs -M test.img" >> $OUT $RESIZE2FS -M $TMPFILE 2>&1 >> $OUT.new 2>&1 status=$? echo Exit status is $status >> $OUT.new -sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT -$FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1 -echo Exit status is $status >> $OUT +echo " " +echo fsck $FSCK_OPT -N test_filesys test.img >> $OUT.new +$FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 +echo Exit status is $status >> $OUT.new +sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT rm $TMPFILE $OUT.new #