summaryrefslogtreecommitdiff
path: root/tests/run_mke2fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-07-22 16:36:51 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-07-22 16:36:51 -0400
commit4764a579b4dc7d87fb5b912e40941efdc91cb3a5 (patch)
tree74ed75164d1868ce98c8cbad1fb1cb08b60bf50c /tests/run_mke2fs
parentbd828a27e2cfec9f14837d9a693e2a414f44bf91 (diff)
downloade2fsprogs-4764a579b4dc7d87fb5b912e40941efdc91cb3a5.tar.gz
Fix mke2fs tests to avoid needing any significant ^M (CR) characters
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'tests/run_mke2fs')
-rw-r--r--tests/run_mke2fs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index 9d039e3f..ab807a5a 100644
--- a/tests/run_mke2fs
+++ b/tests/run_mke2fs
@@ -9,7 +9,7 @@ MKE2FS_SKIP_PROGRESS=true
MKE2FS_SKIP_CHECK_MSG=true
export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
> $TMPFILE
-PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d >> $OUT1 ; echo " " >> $OUT1'
-AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT1'
+PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d | tr -d \\015 > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d | tr -d \\015 >> $OUT1 ; echo " " >> $OUT1'
+AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs | tr -d \\015 >> $OUT1'
. $cmd_dir/run_e2fsck
unset FS_SIZE MKE2FS_OPTS MKE2FS_SKIP_PROGRESS