From 20a57e98df16645999ae32ee13272c193172c586 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 22 Jun 2001 20:29:54 -0400 Subject: [PATCH] Filter out CR characters from the output, since BK filtered \r fromthe expect files. This is needed to make the regression test suite work again. --- tests/ChangeLog | 6 ++++++ tests/defaults/e_script | 2 +- tests/run_e2fsck | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index f95e8dc..ea5f5ad 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2001-06-22 Theodore Tso + + * run_e2fsck, defaults/e_script: Filter out CR characters from the + output, since BK filtered \r fromthe expect files. This + is needed to make the regression test suite work again. + 2001-06-15 Theodore Tso * Release of E2fsprogs 1.21 diff --git a/tests/defaults/e_script b/tests/defaults/e_script index d1f460b..4f88e23 100644 --- a/tests/defaults/e_script +++ b/tests/defaults/e_script @@ -29,7 +29,7 @@ else fi cat $SRCDIR/progs/test_data/$instance.setup $SRCDIR/progs/test_data/test.$class \ - | $TEST_PROG -f - > $OUT 2>&1 + | $TEST_PROG -f - 2>&1 | tr -d '\r' > $OUT cmp -s $EXPECT $OUT status=$? diff --git a/tests/run_e2fsck b/tests/run_e2fsck index f950635..6f8f691 100644 --- a/tests/run_e2fsck +++ b/tests/run_e2fsck @@ -33,7 +33,7 @@ eval $PREP_CMD $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT1.new 2>&1 status=$? echo Exit status is $status >> $OUT1.new -sed -e '1d' -e '/^JFS DEBUG:/d' $OUT1.new > $OUT1 +sed -e '1d' -e '/^JFS DEBUG:/d' $OUT1.new | tr -d '\r' > $OUT1 rm -f $OUT1.new if [ "$ONE_PASS_ONLY" != "true" ]; then -- 1.8.3.1