Fix mke2fs tests to avoid needing any significant ^M (CR) characters

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/tests/m_mkfs_overhead/expect.1 b/tests/m_mkfs_overhead/expect.1
index fff3684d3c69511083079b901f29a7a3a83d22ca..4bfc84e46fdbcfaf8dac1939112e28a8a8f94d1a 100644 (file)
--- a/tests/m_mkfs_overhead/expect.1
+++ b/tests/m_mkfs_overhead/expect.1
@@ -1,10 +1,10 @@
-./test.img: Cannot create filesystem with requested number of inodes while setting up superblock\r
-./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem\r
-features: Filesystem not open\r
+./test.img: Cannot create filesystem with requested number of inodes while setting up superblock
+./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem
+features: Filesystem not open
  
 ../e2fsck/e2fsck: Attempt to read block from filesystem resulted in short read while trying to open ./test.img
 Could this be a zero-length partition?
 Exit status is 8
 
-../misc/dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open ./test.img\r
+../misc/dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open ./test.img
 Couldn't find valid filesystem superblock.

diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1
index f872531065485f18c797c092a309eddb1ee3ff63..18ce190676b8c501c601af69e8902c22a161e39d 100644 (file)
--- a/tests/m_no_opt/expect.1
+++ b/tests/m_no_opt/expect.1
@@ -1,10 +1,10 @@
-mke2fs: reserved online resize blocks not supported on non-sparse filesystem\r
-./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem\r
-features: Filesystem not open\r
+mke2fs: reserved online resize blocks not supported on non-sparse filesystem
+./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem
+features: Filesystem not open
  
 ../e2fsck/e2fsck: Attempt to read block from filesystem resulted in short read while trying to open ./test.img
 Could this be a zero-length partition?
 Exit status is 8
 
-../misc/dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open ./test.img\r
+../misc/dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open ./test.img
 Couldn't find valid filesystem superblock.

diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index 9d039e3f8c976bd98a511a6460d88552ffd87f7b..ab807a5a3ab7c56151663dde4b054e193001c593 100644 (file)
--- 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