LU-11609 mke2fs: allow 64bit feature without extents

[tools/e2fsprogs.git] / tests / run_e2fsck

diff --git a/tests/run_e2fsck b/tests/run_e2fsck
index ab623e8..1a39a89 100644 (file)
--- a/tests/run_e2fsck
+++ b/tests/run_e2fsck
@@ -27,6 +27,8 @@ if [ "$EXP1"x = x ]; then
                gunzip < $test_dir/expect.1.gz > $EXP1
        else
                EXP1=$test_dir/expect.1
+               [ "$CHECK_RHEL7" = "true" -a -f $test_dir/expect_rhel7.1 ] &&
+                       EXP1=$test_dir/expect_rhel7.1 || true
        fi
 fi
 
@@ -36,6 +38,8 @@ if [ "$EXP2"x = x ]; then
                gunzip < $test_dir/expect.2.gz > $EXP2
        else
                EXP2=$test_dir/expect.2
+               [ "$CHECK_RHEL7" = "true" -a -f $test_dir/expect_rhel7.2 ] &&
+                       EXP2=$test_dir/expect_rhel7.2 || true
        fi
 fi
 
@@ -47,19 +51,17 @@ cp /dev/null $OUT1
 
 eval $PREP_CMD
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT1.new 2>&1
+$FSCK $FSCK_OPT  -N test_filesys $TMPFILE >> $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -e '1d' $OUT1.new | sed -e '/^JFS DEBUG:/d' | \
-           sed -e "s;$TMPFILE;test.img;" | tr -d \\015 >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new >> $OUT1
 rm -f $OUT1.new
 
 if [ "$ONE_PASS_ONLY" != "true" ]; then
        $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
        status=$?
        echo Exit status is $status >> $OUT2.new
-       sed -e '1d' $OUT2.new | sed -e '/^JFS DEBUG:/d' | \
-           sed -e "s;$TMPFILE;test.img;" > $OUT2
+       sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
        rm -f $OUT2.new
 fi