tests: remove redundant sed filtering

Now that the majority of device name filtering is in filter.sed,
it does not need to be specified explicitly for every test.

Fix the error message printed in debugfs when opening the device
to match that used in other tools.  This simplifies the filtering,
and will be helpful if debugfs messages are internationalized.

[ Fixed up some test failures in m_hugefile t_uninit_bg_rm --tytso ]

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 9024dd8c4f9a98c316111258bfafb776ad9cf842..a270e8c2e584b54fa98ede9f2d3773391679c738 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -177,7 +177,8 @@ try_open_again:
                goto try_open_again;
        }
        if (retval) {
-               com_err(device, retval, "while opening filesystem");
+               com_err(debug_prog_name, retval,
+                       "while trying to open %s", device);
                if (retval == EXT2_ET_BAD_MAGIC)
                        check_plausibility(device, CHECK_FS_EXIST, NULL);
                current_fs = NULL;

diff --git a/lib/support/plausible.c b/lib/support/plausible.c
index 0636061c5f73cd769c987800e8ab24072386b75e..a7268980e9b18337e2d12d9de779345d87f2c348 100644 (file)
--- a/lib/support/plausible.c
+++ b/lib/support/plausible.c
@@ -246,8 +246,8 @@ int check_plausibility(const char *device, int flags, int *ret_is_dev)
 
        if (fs_type) {
                if (fs_label)
-                       printf(_("%s contains a %s file system "
-                                "labelled '%s'\n"), device, fs_type, fs_label);
+                       printf(_("%s contains a %s file system labelled '%s'\n"),
+                              device, fs_type, fs_label);
                else
                        printf(_("%s contains a %s file system\n"), device,
                               fs_type);

diff --git a/tests/d_dumpe2fs_group_only/script b/tests/d_dumpe2fs_group_only/script
index c3ab7e2bc8fc4df02c4918d5c17b36b43ea3fa73..f0ddcdb4374f0c69b476e416c3989900b45b869f 100644 (file)
--- a/tests/d_dumpe2fs_group_only/script
+++ b/tests/d_dumpe2fs_group_only/script
@@ -25,7 +25,7 @@ $MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 1048576 2>&1 | sed -
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 echo "dumpe2fs output" >> $OUT

diff --git a/tests/d_fallocate/script b/tests/d_fallocate/script
index b41eaafe778792ae7ad55e07d1c50c1d4f288ed5..bb1ded277fbb1a3aa9a0a21e354c50651ac707f6 100644 (file)
--- a/tests/d_fallocate/script
+++ b/tests/d_fallocate/script
@@ -29,7 +29,7 @@ rm -rf $TMPFILE.conf
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 echo "debugfs write files" >> $OUT
@@ -154,7 +154,7 @@ rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/d_fallocate_bigalloc/script b/tests/d_fallocate_bigalloc/script
index 9c8fde89a4acb8eeb45d5059ae6843e6f85f8c57..ec79cd8fd6949d0b3bddb245dfe9b9b3e5c3afd3 100644 (file)
--- a/tests/d_fallocate_bigalloc/script
+++ b/tests/d_fallocate_bigalloc/script
@@ -30,7 +30,7 @@ rm -rf $TMPFILE.conf
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 echo "debugfs write files" >> $OUT
@@ -155,7 +155,7 @@ rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/d_fallocate_blkmap/script b/tests/d_fallocate_blkmap/script
index 86d1deee37a3b0971261ed53ff1c40605cdebb10..fc262c65e88fd2a86db419773ad3c02a0664a8f5 100644 (file)
--- a/tests/d_fallocate_blkmap/script
+++ b/tests/d_fallocate_blkmap/script
@@ -29,7 +29,7 @@ rm -rf $TMPFILE.conf
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 echo "debugfs write files" >> $OUT
@@ -64,7 +64,7 @@ rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/d_punch/script b/tests/d_punch/script
index 5bb51cd60c0d77a07345cd4aac989dae9c20c2ac..ba7270b2bf55df65363b5e7fda528f95abed5eed 100644 (file)
--- a/tests/d_punch/script
+++ b/tests/d_punch/script
@@ -29,7 +29,7 @@ rm -rf $TMPFILE.conf
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 echo "debugfs write files" >> $OUT
@@ -108,7 +108,7 @@ rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/d_punch_bigalloc/script b/tests/d_punch_bigalloc/script
index 7d0c7fe74f560c57f96f5f278568856574e19a6a..e184cd4e330e58836386b1ee6567e8fb3dd376c9 100644 (file)
--- a/tests/d_punch_bigalloc/script
+++ b/tests/d_punch_bigalloc/script
@@ -30,7 +30,7 @@ rm -rf $TMPFILE.conf
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 echo "debugfs write files" >> $OUT
@@ -109,7 +109,7 @@ rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/f_collapse_extent_tree/script b/tests/f_collapse_extent_tree/script
index ee184389cdaf3da6161ae6ec03775bc899787690..b4892000f8e1b844bf5dd33e68d6c0beff4978b9 100644 (file)
--- a/tests/f_collapse_extent_tree/script
+++ b/tests/f_collapse_extent_tree/script
@@ -53,7 +53,7 @@ rm -rf $TMPFILE.cmd
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE >> $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new >> $OUT1
 rm -f $OUT1.new
 
 if [ "$ONE_PASS_ONLY" != "true" ]; then
@@ -63,7 +63,7 @@ if [ "$ONE_PASS_ONLY" != "true" ]; then
        echo 'ex /a' > $TMPFILE.cmd
        $DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT2.new 2>&1
        rm -rf $TMPFILE.cmd
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
+       sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
        rm -f $OUT2.new
 fi
 

diff --git a/tests/f_compress_extent_tree_level/script b/tests/f_compress_extent_tree_level/script
index ee184389cdaf3da6161ae6ec03775bc899787690..b4892000f8e1b844bf5dd33e68d6c0beff4978b9 100644 (file)
--- a/tests/f_compress_extent_tree_level/script
+++ b/tests/f_compress_extent_tree_level/script
@@ -53,7 +53,7 @@ rm -rf $TMPFILE.cmd
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE >> $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new >> $OUT1
 rm -f $OUT1.new
 
 if [ "$ONE_PASS_ONLY" != "true" ]; then
@@ -63,7 +63,7 @@ if [ "$ONE_PASS_ONLY" != "true" ]; then
        echo 'ex /a' > $TMPFILE.cmd
        $DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT2.new 2>&1
        rm -rf $TMPFILE.cmd
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
+       sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
        rm -f $OUT2.new
 fi
 

diff --git a/tests/f_convert_bmap/script b/tests/f_convert_bmap/script
index f6b6f622bbcadc08804227aded5be016faf721e8..79dd79cf2140d95e1ef379e947efcfbbe55805da 100644 (file)
--- a/tests/f_convert_bmap/script
+++ b/tests/f_convert_bmap/script
@@ -54,7 +54,7 @@ $TUNE2FS -O extent $TMPFILE >> $OUT1.new 2>&1
 $FSCK $FSCK_OPT -E bmap2extent -N test_filesys $TMPFILE >> $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new >> $OUT1
 rm -f $OUT1.new
 
 $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
@@ -63,7 +63,7 @@ echo Exit status is $status >> $OUT2.new
 echo 'ex /a' > $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT2.new 2>&1
 rm -rf $TMPFILE.cmd
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
+sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
 rm -f $OUT2.new
 
 eval $AFTER_CMD

diff --git a/tests/f_convert_bmap_and_extent/script b/tests/f_convert_bmap_and_extent/script
index 203ab25c4394ba8461bff58e73b0d75dc002c8a9..33f177a50f5c953ec23e39046c62c2dc173dd30a 100644 (file)
--- a/tests/f_convert_bmap_and_extent/script
+++ b/tests/f_convert_bmap_and_extent/script
@@ -55,7 +55,7 @@ $TUNE2FS -O extent $TMPFILE >> $OUT1.new 2>&1
 $FSCK $FSCK_OPT -E bmap2extent -N test_filesys $TMPFILE >> $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new >> $OUT1
 rm -f $OUT1.new
 
 $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
@@ -65,7 +65,7 @@ echo 'ex /a' > $TMPFILE.cmd
 echo 'ex /zero' >> $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT2.new 2>&1
 rm -rf $TMPFILE.cmd
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
+sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
 rm -f $OUT2.new
 
 eval $AFTER_CMD

diff --git a/tests/f_convert_bmap_sparse/script b/tests/f_convert_bmap_sparse/script
index 89b7ed7492873c6d7fb62b32be063f7f601c5521..4315929796e54add6c69d894360af841c86a0867 100644 (file)
--- a/tests/f_convert_bmap_sparse/script
+++ b/tests/f_convert_bmap_sparse/script
@@ -54,7 +54,7 @@ $TUNE2FS -O extent $TMPFILE >> $OUT1.new 2>&1
 $FSCK $FSCK_OPT -E bmap2extent -N test_filesys $TMPFILE >> $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new >> $OUT1
 rm -f $OUT1.new
 
 $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
@@ -63,7 +63,7 @@ echo Exit status is $status >> $OUT2.new
 echo 'ex /realmode.bin' > $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT2.new 2>&1
 rm -rf $TMPFILE.cmd
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
+sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
 rm -f $OUT2.new
 
 eval $AFTER_CMD

diff --git a/tests/f_create_symlinks/script b/tests/f_create_symlinks/script
index 7d712f5dc0ea408604be5110a4201a292bfcebeb..933973f1b4595cee414d7e422caa94ad06483479 100644 (file)
--- a/tests/f_create_symlinks/script
+++ b/tests/f_create_symlinks/script
@@ -18,12 +18,12 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo mke2fs -q -F -o Linux -b 1024 -g 256 -O inline_data,extents -I 256 test.img 1024 >> $OUT
 $MKE2FS -q -F -o Linux -b 1024 -g 256 -O inline_data,extents -I 256 $TMPFILE 1024 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 for i in 30 60 70 500 1023 1024 1500; do
@@ -41,7 +41,7 @@ done
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/f_detect_junk/expect b/tests/f_detect_junk/expect
index 8febb84df1a40134d0f4a29d359ad11c26256969..59f34b8df989225cfda5ea1c2a880e23df7c3502 100644 (file)
--- a/tests/f_detect_junk/expect
+++ b/tests/f_detect_junk/expect
@@ -12,7 +12,7 @@ is corrupt, and you might try running e2fsck with an alternate superblock:
     e2fsck -b 32768 <device>
 
 *** debugfs
-test.img: Bad magic number in super-block while opening filesystem
+debugfs: Bad magic number in super-block while trying to open test.img
 Checksum errors in superblock!  Retrying...
 *** tune2fs
 ../misc/tune2fs: Bad magic number in super-block while trying to open test.img

diff --git a/tests/f_detect_junk/script b/tests/f_detect_junk/script
index 12cfdfdff25e285dba00a7d916cdf390afd961d9..53d9bac7327c58baf1cea8c090ca1d5233cde2bf 100644 (file)
--- a/tests/f_detect_junk/script
+++ b/tests/f_detect_junk/script
@@ -29,7 +29,7 @@ $TUNE2FS -i 0 $TMPFILE >> $OUT 2>&1
 echo "*** mke2fs" >> $OUT
 $MKE2FS -n $TMPFILE >> $OUT 2>&1
 
-sed -f $cmd_dir/filter.sed -e "s|$TMPFILE|test.img|g" < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 # Figure out what happened

diff --git a/tests/f_detect_xfs/expect b/tests/f_detect_xfs/expect
index 06de99b995b1caafb044894c37ea1a34d9a32ace..f91010bf6c4c5f3f7b16712b2fbdacf5519ea915 100644 (file)
--- a/tests/f_detect_xfs/expect
+++ b/tests/f_detect_xfs/expect
@@ -17,7 +17,7 @@ is corrupt, and you might try running e2fsck with an alternate superblock:
 
 test.img contains a xfs file system labelled 'test_filsys'
 *** debugfs
-test.img: Bad magic number in super-block while opening filesystem
+debugfs: Bad magic number in super-block while trying to open test.img
 Checksum errors in superblock!  Retrying...
 test.img contains a xfs file system labelled 'test_filsys'
 *** tune2fs

diff --git a/tests/f_detect_xfs/script b/tests/f_detect_xfs/script
index 4da1cd9d7d883858e939597dd6feae017bcf2c5d..abd5da87f6509a77d772e6f44e912126e6aad7f5 100644 (file)
--- a/tests/f_detect_xfs/script
+++ b/tests/f_detect_xfs/script
@@ -23,7 +23,7 @@ $TUNE2FS -i 0 $TMPFILE >> $OUT 2>&1
 echo "*** mke2fs" >> $OUT
 $MKE2FS -n -b 1024 $TMPFILE >> $OUT 2>&1
 
-sed -f $cmd_dir/filter.sed -e "s|$TMPFILE|test.img|g" < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 # Figure out what happened

diff --git a/tests/f_extent_too_deep/script b/tests/f_extent_too_deep/script
index ee184389cdaf3da6161ae6ec03775bc899787690..b4892000f8e1b844bf5dd33e68d6c0beff4978b9 100644 (file)
--- a/tests/f_extent_too_deep/script
+++ b/tests/f_extent_too_deep/script
@@ -53,7 +53,7 @@ rm -rf $TMPFILE.cmd
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE >> $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new >> $OUT1
 rm -f $OUT1.new
 
 if [ "$ONE_PASS_ONLY" != "true" ]; then
@@ -63,7 +63,7 @@ if [ "$ONE_PASS_ONLY" != "true" ]; then
        echo 'ex /a' > $TMPFILE.cmd
        $DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT2.new 2>&1
        rm -rf $TMPFILE.cmd
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
+       sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
        rm -f $OUT2.new
 fi
 

diff --git a/tests/f_opt_extent/script b/tests/f_opt_extent/script
index 2da5e919d60c40fc6477a5fa7bb7e9acdba4e513..f2228dcfc9a2e61f1015eb4662f5c1630150583c 100644 (file)
--- a/tests/f_opt_extent/script
+++ b/tests/f_opt_extent/script
@@ -47,7 +47,7 @@ rm $TMPFILE $OUT.before $OUT.after
 # Do the verification
 #
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" -e 's/test_filesys:.*//g' < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed -e 's/test_filesys:.*//g' < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 cmp -s $OUT $EXP

diff --git a/tests/f_opt_extent_ext3/script b/tests/f_opt_extent_ext3/script
index 931eae778913e5c2156521f870a309a0f8d0696c..4dace4e510786fbd5647c8f947c65452aa04fd90 100644 (file)
--- a/tests/f_opt_extent_ext3/script
+++ b/tests/f_opt_extent_ext3/script
@@ -48,7 +48,7 @@ rm $TMPFILE $OUT.before $OUT.after
 # Do the verification
 #
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" -e 's/test_filesys:.*//g' < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed -e 's/test_filesys:.*//g' < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 cmp -s $OUT $EXP

diff --git a/tests/f_readonly_fsck/script b/tests/f_readonly_fsck/script
index d46c5a8015c27ec804f3bccd03e83cd51176ea73..8e67e1fe522d94848db379a01f2618624054d015 100644 (file)
--- a/tests/f_readonly_fsck/script
+++ b/tests/f_readonly_fsck/script
@@ -18,7 +18,7 @@ old="$($CRCSUM < $TMPFILE)"
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 new="$($CRCSUM < $TMPFILE)"

diff --git a/tests/f_resize_inode/script b/tests/f_resize_inode/script
index 0243bdac3ba5324e301fcfdc5e65f3656d82d43a..a4f1949a50afb6edc0bd1e7f3abc3ba813516ce4 100644 (file)
--- a/tests/f_resize_inode/script
+++ b/tests/f_resize_inode/script
@@ -19,12 +19,12 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT
 $MKE2FS -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 echo ----------------------------------------------- >> $OUT

diff --git a/tests/filter.sed b/tests/filter.sed
index 628309d75676fca1d58d00287fc90d30e24e4bcd..f37986ce1a1efde3fdb5976960322a60a4c3c157 100644 (file)
--- a/tests/filter.sed
+++ b/tests/filter.sed
@@ -27,3 +27,13 @@ s/\\015//g
 s/, csum 0x\([0-9a-f]*\)//g
 s/ csum 0x\([0-9a-f]*\)//g
 /^Checksum:/d
+s/while trying to open [^ ]*/while trying to open test.img/
+s/he filesystem on [^ ]* /he filesystem on test.img /
+s/^[^ ]* contains a \([a-z]*\) file system /test.img contains a \1 file system /
+s/MMP block [0-9]* from [^ ]*/MMP block from test.img/
+s/safe to mount '.*', MMP/safe to mount 'test.img', MMP/
+s/mmp_device_name: .*/mmp_device_name: test.img/
+s/mmp_node_name: .*/mmp_node_name: test_node/
+s/mmp_update_date: .*/mmp_update_date: test date/
+s/mmp_update_time: .*/mmp_update_time: test_time/
+s/MMP last updated by '.*' on .*/MMP last updated by 'test_node' on test date/

diff --git a/tests/j_short_trans/script b/tests/j_short_trans/script
index 8108ba8509c375d4a01a30f7b9d44b9f255182cc..ff2322c5df9267827f3078f865d869980b8bb6e7 100644 (file)
--- a/tests/j_short_trans/script
+++ b/tests/j_short_trans/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -40,7 +40,7 @@ rm -rf $TMPFILE.cmd
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/j_short_trans_64bit/script b/tests/j_short_trans_64bit/script
index 70649c23877de9de44b368f87ec5bffc8dce0578..b7525fb750cae8ad53b28fa0f0dfd21dbdf5da92 100644 (file)
--- a/tests/j_short_trans_64bit/script
+++ b/tests/j_short_trans_64bit/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal -T ext4 $TMPFILE 65536 2>&1 | s
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -44,7 +44,7 @@ rm -rf $TMPFILE.cmd
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/j_short_trans_mcsum_64bit/script b/tests/j_short_trans_mcsum_64bit/script
index ad736eb94270af05133cd0fd3f6c3aeffe94e231..a8f4e9370648a6027c53b6f212937bf36cc80391 100644 (file)
--- a/tests/j_short_trans_mcsum_64bit/script
+++ b/tests/j_short_trans_mcsum_64bit/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -44,7 +44,7 @@ rm -rf $TMPFILE.cmd
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE $TMPFILE.cmd

diff --git a/tests/j_short_trans_old_csum/script b/tests/j_short_trans_old_csum/script
index cb13acbb5a188110ccf88d1583c53ea387cb96a7..46d0336e6ad2d6b3e3286a632e5f937887b83a5c 100644 (file)
--- a/tests/j_short_trans_old_csum/script
+++ b/tests/j_short_trans_old_csum/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -44,7 +44,7 @@ rm -rf $TMPFILE.cmd
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/j_short_trans_open_recover/script b/tests/j_short_trans_open_recover/script
index fe1d9e8e1ca4dc9693a1b70cfa5410a55e855f9c..b0cc790dca14635bc0f7808d21fc52dee4a81dc3 100644 (file)
--- a/tests/j_short_trans_open_recover/script
+++ b/tests/j_short_trans_open_recover/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -48,7 +48,7 @@ rm -rf $OUT.new
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE $TMPFILE.cmd

diff --git a/tests/j_short_trans_recover/script b/tests/j_short_trans_recover/script
index a44111b7b93a2c681d24169d0c3e2651e37225ef..ce82c87e2dcc7daceaad411287f205321be74949 100644 (file)
--- a/tests/j_short_trans_recover/script
+++ b/tests/j_short_trans_recover/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -49,7 +49,7 @@ rm -rf $OUT.new
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE $TMPFILE.cmd

diff --git a/tests/j_short_uncommitted_trans/script b/tests/j_short_uncommitted_trans/script
index ef0548ba1d4a76c3e94976bff70855efc716e329..694d0c94ba5a0a2395f52c2932afee87c8dd1b24 100644 (file)
--- a/tests/j_short_uncommitted_trans/script
+++ b/tests/j_short_uncommitted_trans/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -40,7 +40,7 @@ rm -rf $TMPFILE.cmd
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/j_short_uncommitted_trans_mcsum_64bit/script b/tests/j_short_uncommitted_trans_mcsum_64bit/script
index 68965a9d1a6ed9187b56466fa21c28daccf7374f..87e4c2754ef8185e64de4e185a2a074ef8cd54fa 100644 (file)
--- a/tests/j_short_uncommitted_trans_mcsum_64bit/script
+++ b/tests/j_short_uncommitted_trans_mcsum_64bit/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -44,7 +44,7 @@ rm -rf $TMPFILE.cmd
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE

diff --git a/tests/m_devdir/script b/tests/m_devdir/script
index 3b1ef10bd57969cfd649754512bf4a7396c8c97b..ef365b39a4dc7e7ab85985c40f6c68de3f3d30bf 100644 (file)
--- a/tests/m_devdir/script
+++ b/tests/m_devdir/script
@@ -16,7 +16,7 @@ $DEBUGFS -R 'ls /' $TMPFILE >> $OUT 2>&1
 $FSCK -f -n $TMPFILE >> $OUT 2>&1
 fsck_status=$?
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" < $OUT > $OUT.tmp
+sed -f $cmd_dir/filter.sed < $OUT > $OUT.tmp
 mv $OUT.tmp $OUT
 
 if [ $mkfs_status -ne 0 ]; then

diff --git a/tests/m_hugefile/expect b/tests/m_hugefile/expect
index 831d31ad1c85b6c242db0da66e5f01d9ef2332d7..ee33fe513a42c205a086c84192f45bd3c2c3b028 100644 (file)
--- a/tests/m_hugefile/expect
+++ b/tests/m_hugefile/expect
@@ -12,7 +12,7 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-
+test_filesys: 13/1048576 files (0.0% non-contiguous), 1073709417/1073741824 blocks
 Exit status is 0
 debugfs -R "extents /store/big-data" test.img
 Last logical block: 1073610751

diff --git a/tests/m_hugefile/script b/tests/m_hugefile/script
index 68d26fbbc941b231e2bf5b1eb8acc2bf0da0fad6..846e4c6bf7acc00f8b71ba1d91b8902e0f833593 100644 (file)
--- a/tests/m_hugefile/script
+++ b/tests/m_hugefile/script
@@ -102,7 +102,7 @@ rm $TMPFILE
 # Do the verification
 #
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" -e 's/test_filesys:.*//g' < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 cmp -s $OUT $EXP

diff --git a/tests/r_inline_xattr/script b/tests/r_inline_xattr/script
index 04baac859fea82b7bf1520af1f45c6ef32251543..7f0fb23dfb7a71778059e8925d7b0b089df6ef13 100644 (file)
--- a/tests/r_inline_xattr/script
+++ b/tests/r_inline_xattr/script
@@ -23,7 +23,7 @@ echo "resize2fs test.img 5M" >> $OUT
 $RESIZE2FS $TMPFILE 5M 2>&1 >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
 # Look at inline extended attribute in resized fs
 echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT

diff --git a/tests/r_min_itable/script b/tests/r_min_itable/script
index e7787360e4774e6e7777bcc67400139b0f79ed30..b889adc613852415056a4337720745261e83076c 100644 (file)
--- a/tests/r_min_itable/script
+++ b/tests/r_min_itable/script
@@ -22,7 +22,7 @@ echo fsck $FSCK_OPT -N test_filesys test.img >> $OUT.new
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
 echo Exit status is $status >> $OUT.new
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm $TMPFILE $OUT.new
 
 #

diff --git a/tests/r_move_itable/script b/tests/r_move_itable/script
index 6109f35f146e960552f2be378cb63f30cc45bf1b..c017efc5e69aa791152cb0084b4cf15bdc474fbf 100644 (file)
--- a/tests/r_move_itable/script
+++ b/tests/r_move_itable/script
@@ -18,16 +18,15 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo mke2fs -q -F -o Linux -b 1024 -g 256 test.img 1024 > $OUT
 $MKE2FS -q -F -o Linux -b 1024 -g 256 $TMPFILE 1024 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 echo resize2fs -p test.img 10000 >> $OUT
-$RESIZE2FS -p $TMPFILE 10000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS -p $TMPFILE 10000 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -42,12 +41,12 @@ echo "--------------------------------" >> $OUT
 
 echo resize2fs -p test.img 20000 >> $OUT
 $RESIZE2FS -p $TMPFILE 20000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -62,12 +61,12 @@ echo "--------------------------------" >> $OUT
 
 echo resize2fs -p test.img 30000 >> $OUT
 $RESIZE2FS -p $TMPFILE 30000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -82,12 +81,12 @@ echo "--------------------------------" >> $OUT
 
 echo resize2fs -p test.img 40000 >> $OUT
 $RESIZE2FS -p $TMPFILE 40000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1

diff --git a/tests/r_move_itable_nostride/script b/tests/r_move_itable_nostride/script
index d3b95b12e91838ec5a35fadb9f5ddf1dc63b7f7e..ec4665ee730bc712b8e00032f5fc8867bea06588 100644 (file)
--- a/tests/r_move_itable_nostride/script
+++ b/tests/r_move_itable_nostride/script
@@ -31,16 +31,16 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 echo mke2fs -q -F -o Linux -b 1024 -i 1024 -E stride=8192 -t ext4 test.img 1024000 > $OUT
 $MKE2FS -q -F -o Linux -b 1024 -i 1024 -E stride=8192 -t ext4 \
        $TMPFILE 1024000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 echo resize2fs -p test.img 10240000 >> $OUT
 $RESIZE2FS -p $TMPFILE 100000000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1

diff --git a/tests/r_move_itable_realloc/script b/tests/r_move_itable_realloc/script
index 7005bf805bd598185bcfa3e53c8736007c4c74c8..7d4b5bac0627d176344425fea04a8538d1be737a 100644 (file)
--- a/tests/r_move_itable_realloc/script
+++ b/tests/r_move_itable_realloc/script
@@ -31,16 +31,16 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 echo mke2fs -q -F -o Linux -b 1024 -i 1024 -O ^resize_inode -t ext4 test.img 1024000 > $OUT
 $MKE2FS -q -F -o Linux -b 1024 -i 1024 -O ^resize_inode -t ext4 \
        $TMPFILE 1024000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 echo resize2fs -p test.img 10240000 >> $OUT
 $RESIZE2FS -p $TMPFILE 100000000 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1

diff --git a/tests/r_resize_inode/script b/tests/r_resize_inode/script
index 4e3eb19a2a3798b58a340285fb42faf3e940a479..8b586d3317bdee30f7307bca7c9fd39ea104b3f5 100644 (file)
--- a/tests/r_resize_inode/script
+++ b/tests/r_resize_inode/script
@@ -15,16 +15,15 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT
 $MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 echo resize2fs test.img 65536 >> $OUT
-$RESIZE2FS $TMPFILE 65536 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -41,16 +40,15 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 >> $OUT
 $MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+       sed -f $cmd_dir/filter.sed >> $OUT
 
 echo resize2fs test.img 16384 >> $OUT
-$RESIZE2FS $TMPFILE 16384 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS $TMPFILE 16384 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -64,13 +62,12 @@ $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n
 echo "--------------------------------" >> $OUT
 
 echo resize2fs test.img 165536 >> $OUT
-$RESIZE2FS $TMPFILE 165536 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS $TMPFILE 165536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1

diff --git a/tests/run_e2fsck b/tests/run_e2fsck
index 5f28d9213bfde896822fb3de252c761dcfaaaf5b..f96517940da323d28464c661f5ca8d7d59be7334 100644 (file)
--- a/tests/run_e2fsck
+++ b/tests/run_e2fsck
@@ -50,14 +50,14 @@ eval $PREP_CMD
 $FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT1.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT1.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $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 -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
+       sed -f $cmd_dir/filter.sed $OUT2.new > $OUT2
        rm -f $OUT2.new
 fi
 

diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index 2a784fe611946180a62e60544dc4f77bf59cf5e6..7a47f56fbf47a8184866ad72f205be0dec8d4a9d 100644 (file)
--- a/tests/run_mke2fs
+++ b/tests/run_mke2fs
@@ -12,9 +12,9 @@ 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 -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" > $OUT1;
+       sed -f $cmd_dir/filter.sed >> $OUT1;
        $DEBUGFS -R features $TMPFILE 2>&1 |
-       sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT1'
+       sed -f $cmd_dir/filter.sed >> $OUT1'
 AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT1'
 . $cmd_dir/run_e2fsck
 

diff --git a/tests/t_dangerous/script b/tests/t_dangerous/script
index dc70ad2c7da23129c6efb87fc089b00d99de558a..b7142188127caaa5e990fa228d0dc4979e518888 100644 (file)
--- a/tests/t_dangerous/script
+++ b/tests/t_dangerous/script
@@ -117,7 +117,7 @@ rm $TMPFILE $OUT.before $OUT.after $CONF
 # Do the verification
 #
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" -e 's/test_filesys:.*//g' < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed -e 's/test_filesys:.*//g' < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 cmp -s $OUT $EXP

diff --git a/tests/t_iexpand_full/script b/tests/t_iexpand_full/script
index 875c70e85e64327b205712e4fdd129c7ef4b67b5..63302c81ebd3fecef0c46072dc68d989420edd9d 100644 (file)
--- a/tests/t_iexpand_full/script
+++ b/tests/t_iexpand_full/script
@@ -64,7 +64,7 @@ rm $TMPFILE
 # Do the verification
 #
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" -e 's/test_filesys:.*//g' < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed -e 's/test_filesys:.*//g' < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 cmp -s $OUT $EXP

diff --git a/tests/t_iexpand_mcsum/script b/tests/t_iexpand_mcsum/script
index 116cad902d604a3c1776873c118935ad926f34f1..d9cd28f7c9cfeb7fc1ca34d3034917b6b67a309f 100644 (file)
--- a/tests/t_iexpand_mcsum/script
+++ b/tests/t_iexpand_mcsum/script
@@ -65,7 +65,7 @@ rm $TMPFILE
 # Do the verification
 #
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" -e 's/test_filesys:.*//g' < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed -e 's/test_filesys:.*//g' < $OUT > $OUT.new
 mv $OUT.new $OUT
 
 cmp -s $OUT $EXP

diff --git a/tests/t_replay_and_set/script b/tests/t_replay_and_set/script
index bec9108a78a8009cb3eecdb155d09abc6ebe8e6d..2663af26cb6551c01cab0f9db8b5f82cf374734a 100644 (file)
--- a/tests/t_replay_and_set/script
+++ b/tests/t_replay_and_set/script
@@ -19,7 +19,7 @@ $MKE2FS -F -o Linux -b 4096 -O has_journal,metadata_csum -T ext4 $TMPFILE 65536
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
@@ -39,7 +39,7 @@ echo "fsck the whole mess" >> $OUT
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new
 
 rm -f $TMPFILE $TMPFILE.cmd

diff --git a/tests/t_uninit_bg_rm/script b/tests/t_uninit_bg_rm/script
index 308ef25594bec8bcfe3647e98ce00e5082981cb3..3757a5ae567304b0293d617ff1b12e3c1c03095d 100644 (file)
--- a/tests/t_uninit_bg_rm/script
+++ b/tests/t_uninit_bg_rm/script
@@ -12,10 +12,10 @@ fi
 cp /dev/null $TMPFILE
 rm -f $OUT.new
 
-echo mke2fs -q -t ext4 -F -o Linux -b 1024 $TMPFILE 1G >> $OUT.new
+echo mke2fs -q -t ext4 -F -o Linux -b 1024 test.img 1G >> $OUT.new
 $MKE2FS -q -t ext4 -F -o Linux -b 1024 $TMPFILE 1G >> $OUT.new 2>&1
 
-echo "tune2fs -f -O ^uninit_bg $TMPFILE" >> $OUT.new
+echo "tune2fs -f -O ^uninit_bg test.img" >> $OUT.new
 $TUNE2FS -f -O ^uninit_bg $TMPFILE >> $OUT.new 2>&1
 
 echo " " >> $OUT.new
@@ -24,17 +24,17 @@ $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
 
 echo " " >> $OUT.new
 cp /dev/null $TMPFILE
-echo mke2fs -q -t ext4 -O bigalloc -F -o Linux -b 1024 -C 8192 $TMPFILE 10G >> $OUT.new
+echo mke2fs -q -t ext4 -O bigalloc -F -o Linux -b 1024 -C 8192 test.img 10G >> $OUT.new
 $MKE2FS -q -t ext4 -O bigalloc -F -o Linux -b 1024 -C 8192 $TMPFILE 10G >> $OUT.new 2>&1
 
-echo "tune2fs -f -O ^uninit_bg $TMPFILE" >> $OUT.new
+echo "tune2fs -f -O ^uninit_bg test.img" >> $OUT.new
 $TUNE2FS -f -O ^uninit_bg $TMPFILE >> $OUT.new 2>&1
 
 echo " " >> $OUT.new
 echo fsck $FSCK_OPT -N test_filesys test.img >> $OUT.new
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 
 rm -f $OUT.new $TMPFILE
 

diff --git a/tests/test_one.in b/tests/test_one.in
index 664cf8603564688f0d63185857b7e454c6fe3e1d..7c5f464d927d03aa246703887967f99e9874ad4b 100644 (file)
--- a/tests/test_one.in
+++ b/tests/test_one.in
@@ -57,7 +57,7 @@ if [ -n "$SKIP_SLOW_TESTS" -a -f $test_dir/is_slow_test ]; then
     exit 0
 fi
 
-rm -f $test_name.ok $test_name.failed
+rm -f $test_name.ok $test_name.failed $test_name.log $test_name.slow
 #echo -e -n "$test_name: $test_description:\r"
 
 TMPFILE=$(mktemp ${TMPDIR:-/tmp}/e2fsprogs-tmp-$test_name.XXXXXX)