diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-07-22 16:36:51 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-07-22 16:36:51 -0400 |
| commit | 4764a579b4dc7d87fb5b912e40941efdc91cb3a5 (patch) | |
| tree | 74ed75164d1868ce98c8cbad1fb1cb08b60bf50c /tests | |
| parent | bd828a27e2cfec9f14837d9a693e2a414f44bf91 (diff) | |
| download | e2fsprogs-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')
| -rw-r--r-- | tests/m_mkfs_overhead/expect.1 | 8 | ||||
| -rw-r--r-- | tests/m_no_opt/expect.1 | 8 | ||||
| -rw-r--r-- | tests/run_mke2fs | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/m_mkfs_overhead/expect.1 b/tests/m_mkfs_overhead/expect.1 index fff3684d..4bfc84e4 100644 --- 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
-./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem
-features: Filesystem not open
+./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
+../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 f8725310..18ce1906 100644 --- 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
-./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem
-features: Filesystem not open
+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
+../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 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 |