tests: don't run sed multiple times on test output

Don't call sed multiple times on the output, and avoid the use
of temporary files, or if possible.  It would be convenient to
use "sed -i" to only update the output file once, but this is
not portable to all platforms.

[ Fixed a few test regression failures --tytso ]

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

diff --git a/tests/d_dumpe2fs_group_only/script b/tests/d_dumpe2fs_group_only/script
index f0ddcdb4374f0c69b476e416c3989900b45b869f..01373b9672b9f9c69145394a9f6fd7adfa295f46 100644 (file)
--- a/tests/d_dumpe2fs_group_only/script
+++ b/tests/d_dumpe2fs_group_only/script
@@ -18,20 +18,16 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 1048576 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 1048576 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-echo "dumpe2fs output" >> $OUT
-$DUMPE2FS -g $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 
-rm -f $TMPFILE
+echo "dumpe2fs output" >> $OUT.new
+$DUMPE2FS -g $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/d_fallocate/script b/tests/d_fallocate/script
index bb1ded277fbb1a3aa9a0a21e354c50651ac707f6..36fa0192de25c9fa95746196621572ec1a4c0007 100644 (file)
--- a/tests/d_fallocate/script
+++ b/tests/d_fallocate/script
@@ -12,8 +12,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 cat > $TMPFILE.conf << ENDL
 [fs_types]
 ext4 = {
@@ -23,16 +21,14 @@ ext4 = {
         inode_ratio = 16384
 }
 ENDL
-MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O ^bigalloc -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-rm -rf $TMPFILE.conf
+MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O ^bigalloc -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
+rm -f $TMPFILE.conf
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo "debugfs write files" >> $OUT
+echo "debugfs write files" >> $OUT.new
 make_file() {
        name="$1"
        start="$2"
@@ -148,16 +144,12 @@ echo "ex /k" >> $TMPFILE.cmd2
 
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
 $DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $TMPFILE.cmd2 $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/d_fallocate_bigalloc/script b/tests/d_fallocate_bigalloc/script
index ec79cd8fd6949d0b3bddb245dfe9b9b3e5c3afd3..d4bf749babc60bd8cb546a799fc8e4bbad0a75a0 100644 (file)
--- a/tests/d_fallocate_bigalloc/script
+++ b/tests/d_fallocate_bigalloc/script
@@ -12,8 +12,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 cat > $TMPFILE.conf << ENDL
 [fs_types]
 ext4 = {
@@ -24,16 +22,14 @@ ext4 = {
         inode_ratio = 16384
 }
 ENDL
-MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O bigalloc -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-rm -rf $TMPFILE.conf
+MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O bigalloc -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
+rm -f $TMPFILE.conf
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo "debugfs write files" >> $OUT
+echo "debugfs write files" >> $OUT.new
 make_file() {
        name="$1"
        start="$2"
@@ -149,16 +145,13 @@ echo "ex /k" >> $TMPFILE.cmd2
 
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
 $DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
 
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $TMPFILE.cmd2 $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/d_fallocate_blkmap/script b/tests/d_fallocate_blkmap/script
index fc262c65e88fd2a86db419773ad3c02a0664a8f5..2ec319fb59039ddb432d72f66048e2bfe85512ec 100644 (file)
--- a/tests/d_fallocate_blkmap/script
+++ b/tests/d_fallocate_blkmap/script
@@ -12,8 +12,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 cat > $TMPFILE.conf << ENDL
 [fs_types]
 ext4 = {
@@ -23,17 +21,14 @@ ext4 = {
         inode_ratio = 16384
 }
 ENDL
-MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O ^bigalloc -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-rm -rf $TMPFILE.conf
+MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O ^bigalloc -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
+rm -f $TMPFILE.conf
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-echo "debugfs write files" >> $OUT
 
+echo "debugfs write files" >> $OUT.new
 #Files we create:
 # a: fallocate a 40k file
 # k: one big file
@@ -58,16 +53,12 @@ echo "stat /b" >> $TMPFILE.cmd2
 
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
 $DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
-sed -f $cmd_dir/filter.sed -e '/^.*time:.*$/d' < $OUT.new >> $OUT
-rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e '/^.*time:.*$/d' $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $TMPFILE.cmd2 $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index c91a6e94c686608813626753ee79a4ab4ed36abe..ace33723cc3b09175e58e7c47bbdc335b66370e6 100644 (file)
--- a/tests/d_loaddump/script
+++ b/tests/d_loaddump/script
@@ -10,41 +10,39 @@ VERIFY_FSCK_OPT=-yf
 TEST_DATA=$test_name.tmp
 VERIFY_DATA=$test_name.ver.tmp
 
-echo "debugfs load/dump test" > $OUT
+echo "debugfs load/dump test" > $OUT.new
 
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
-echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
+echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT.new
 
 $MKE2FS -Fq -b 1024 $TMPFILE 512 > /dev/null 2>&1
 status=$?
-echo Exit status is $status >> $OUT
+echo Exit status is $status >> $OUT.new
 
 dd if=$TEST_BITS of=$TEST_DATA bs=128k count=1 conv=sync > /dev/null 2>&1 
 echo "file fragment odd size" >> $TEST_DATA
 
-echo "debugfs -R ''write $TEST_DATA test_data'' -w test.img" > $OUT.new
+echo "debugfs -R ''write $TEST_DATA test_data'' -w test.img" >> $OUT.new
 $DEBUGFS -R "write $TEST_DATA test_data" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
+echo e2fsck $VERIFY_FSCK_OPT -N test_filesys >> $OUT.new
 $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "debugfs -R ''dump test_data $VERIFY_DATA'' test.img" > $OUT.new
+echo "debugfs -R ''dump test_data $VERIFY_DATA'' test.img" >> $OUT.new
 $DEBUGFS -R "dump test_data $VERIFY_DATA" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "cmp $TEST_DATA $VERIFY_DATA" >> $OUT
-cmp $TEST_DATA $VERIFY_DATA >>$OUT
+echo "cmp $TEST_DATA $VERIFY_DATA" >> $OUT.new
+cmp $TEST_DATA $VERIFY_DATA >>$OUT.new
 status=$?
-echo Exit status is $status >> $OUT
+echo Exit status is $status >> $OUT.new
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 
 #
 # Do the verification

diff --git a/tests/d_punch/script b/tests/d_punch/script
index ba7270b2bf55df65363b5e7fda528f95abed5eed..e0eee76fd68723802cd59539085c247cdc2c4d27 100644 (file)
--- a/tests/d_punch/script
+++ b/tests/d_punch/script
@@ -12,8 +12,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 cat > $TMPFILE.conf << ENDL
 [fs_types]
 ext4 = {
@@ -23,16 +21,14 @@ ext4 = {
         inode_ratio = 16384
 }
 ENDL
-MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O ^bigalloc -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-rm -rf $TMPFILE.conf
+MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O ^bigalloc -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
+rm -f $TMPFILE.conf
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo "debugfs write files" >> $OUT
+echo "debugfs write files" >> $OUT.new
 make_file() {
        name="$1"
        start="$2"
@@ -102,16 +98,12 @@ echo "ex /f" >> $TMPFILE.cmd2
 
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
 $DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $TMPFILE.cmd2 $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/d_punch_bigalloc/script b/tests/d_punch_bigalloc/script
index e184cd4e330e58836386b1ee6567e8fb3dd376c9..73eee469a55ef3cc77e997cec01d8c8a7bc7189d 100644 (file)
--- a/tests/d_punch_bigalloc/script
+++ b/tests/d_punch_bigalloc/script
@@ -12,8 +12,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 cat > $TMPFILE.conf << ENDL
 [fs_types]
 ext4 = {
@@ -24,16 +22,14 @@ ext4 = {
         inode_ratio = 16384
 }
 ENDL
-MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O bigalloc -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-rm -rf $TMPFILE.conf
+MKE2FS_CONFIG=$TMPFILE.conf $MKE2FS -F -o Linux -b 1024 -O bigalloc -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
+rm -f $TMPFILE.conf
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo "debugfs write files" >> $OUT
+echo "debugfs write files" >> $OUT.new
 make_file() {
        name="$1"
        start="$2"
@@ -103,16 +99,12 @@ echo "ex /f" >> $TMPFILE.cmd2
 
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
 $DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $TMPFILE.cmd2 $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/d_special_files/script b/tests/d_special_files/script
index 746d724b6ca5ce6e458cfab7ff27ba8d27d4ec24..c2a7fa00c7ba467af3fe50a509d92a7bb86a4a96 100644 (file)
--- a/tests/d_special_files/script
+++ b/tests/d_special_files/script
@@ -10,15 +10,15 @@ VERIFY_FSCK_OPT=-yf
 TEST_DATA=$test_name.tmp
 VERIFY_DATA=$test_name.ver.tmp
 
-echo "debugfs create special files" > $OUT
+echo "debugfs create special files" > $OUT.new
 
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
-echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
+echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT.new
 
 $MKE2FS -Fq -b 1024 -o linux $TMPFILE 512 > /dev/null 2>&1
 status=$?
-echo Exit status is $status >> $OUT
+echo Exit status is $status >> $OUT.new
 
 $DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
 set_current_time 20130115140000
@@ -32,47 +32,41 @@ mknod sda b 8 0
 mknod null c 1 3
 EOF
 
-echo "debugfs -R ''stat foo'' -w test.img" > $OUT.new
+echo "debugfs -R ''stat foo'' -w test.img" >> $OUT.new
 $DEBUGFS -R "stat foo" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "debugfs -R ''stat foo2'' -w test.img" > $OUT.new
+echo "debugfs -R ''stat foo2'' -w test.img" >> $OUT.new
 $DEBUGFS -R "stat foo2" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "debugfs -R ''block_dump 28'' -w test.img" > $OUT.new
+echo "debugfs -R ''block_dump 28'' -w test.img" >> $OUT.new
 $DEBUGFS -R "block_dump 28" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "debugfs -R ''stat pipe'' -w test.img" > $OUT.new
+echo "debugfs -R ''stat pipe'' -w test.img" >> $OUT.new
 $DEBUGFS -R "stat pipe" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "debugfs -R ''stat sda'' -w test.img" > $OUT.new
+echo "debugfs -R ''stat sda'' -w test.img" >> $OUT.new
 $DEBUGFS -R "stat sda" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "debugfs -R ''stat null'' -w test.img" > $OUT.new
+echo "debugfs -R ''stat null'' -w test.img" >> $OUT.new
 $DEBUGFS -R "stat null" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
+echo e2fsck $VERIFY_FSCK_OPT -N test_filesys >> $OUT.new
 $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 
 #
 # Do the verification

diff --git a/tests/d_xattr_edits/script b/tests/d_xattr_edits/script
index 13550a17d8a83016f3c9e0361598d0599c78ec9e..07906c2bc90745cc42194d279f5d312e3ff7b315 100644 (file)
--- a/tests/d_xattr_edits/script
+++ b/tests/d_xattr_edits/script
@@ -10,122 +10,106 @@ VERIFY_FSCK_OPT=-yf
 TEST_DATA=$test_name.tmp
 VERIFY_DATA=$test_name.ver.tmp
 
-echo "debugfs edit extended attributes" > $OUT
+echo "debugfs edit extended attributes" > $OUT.new
 
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
-echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
+echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT.new
 
 $MKE2FS -Fq -b 1024 $TMPFILE 512 > /dev/null 2>&1
 status=$?
-echo Exit status is $status >> $OUT
+echo Exit status is $status >> $OUT.new
 
-echo "ea_set / user.joe smith" > $OUT.new
+echo "ea_set / user.joe smith" >> $OUT.new
 $DEBUGFS -w -R "ea_set / user.joe smith" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_set / user.moo FEE_FIE_FOE_FUMMMMMM" > $OUT.new
+echo "ea_set / user.moo FEE_FIE_FOE_FUMMMMMM" >> $OUT.new
 $DEBUGFS -w -R "ea_set / user.moo FEE_FIE_FOE_FUMMMMMM" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_list /" > $OUT.new
+echo "ea_list /" >> $OUT.new
 $DEBUGFS -w -R "ea_list /" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get / user.moo" > $OUT.new
+echo "ea_get / user.moo" >> $OUT.new
 $DEBUGFS -w -R "ea_get / user.moo" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get / nosuchea" > $OUT.new
+echo "ea_get / nosuchea" >> $OUT.new
 $DEBUGFS -w -R "ea_get / nosuchea" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_rm / user.moo" > $OUT.new
+echo "ea_rm / user.moo" >> $OUT.new
 $DEBUGFS -w -R "ea_rm / user.moo" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_rm / nosuchea" > $OUT.new
+echo "ea_rm / nosuchea" >> $OUT.new
 $DEBUGFS -w -R "ea_rm / nosuchea" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_list /" > $OUT.new
+echo "ea_list /" >> $OUT.new
 $DEBUGFS -w -R "ea_list /" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get / user.moo" > $OUT.new
+echo "ea_get / user.moo" >> $OUT.new
 $DEBUGFS -w -R "ea_get / user.moo" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_rm / user.joe" > $OUT.new
+echo "ea_rm / user.joe" >> $OUT.new
 $DEBUGFS -w -R "ea_rm / user.joe" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_list /" > $OUT.new
+echo "ea_list /" >> $OUT.new
 $DEBUGFS -w -R "ea_list /" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
 echo "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567" > $TEST_DATA
-echo "ea_set -f $TEST_DATA / user.file_based_xattr" > $OUT.new
+echo "ea_set -f $TEST_DATA / user.file_based_xattr" >> $OUT.new
 $DEBUGFS -w -R "ea_set -f $TEST_DATA / user.file_based_xattr" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_list /" > $OUT.new
+echo "ea_list /" >> $OUT.new
 $DEBUGFS -w -R "ea_list /" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get / user.file_based_xattr" > $OUT.new
+echo "ea_get / user.file_based_xattr" >> $OUT.new
 $DEBUGFS -w -R "ea_get / user.file_based_xattr" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get -f $VERIFY_DATA / user.file_based_xattr" > $OUT.new
+echo "ea_get -f $VERIFY_DATA / user.file_based_xattr" >> $OUT.new
 $DEBUGFS -w -R "ea_get -f $VERIFY_DATA / user.file_based_xattr" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "Compare big attribute" > $OUT.new
+echo "Compare big attribute" >> $OUT.new
 diff -u $TEST_DATA $VERIFY_DATA >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
+echo e2fsck $VERIFY_FSCK_OPT -N test_filesys >> $OUT.new
 $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 
 #
 # Do the verification
 #
 
-rm -f $TMPFILE $OUT.new $TEST_DATA $VERIFY_DATA
+rm -f $TMPFILE $TEST_DATA $VERIFY_DATA $OUT.new
 cmp -s $OUT $EXP
 status=$?
 

diff --git a/tests/d_xattr_sorting/script b/tests/d_xattr_sorting/script
index a599f3c4d801f40a9afd6fd6166129e26d162967..866611502012162149ae8548bb73ba7169635e16 100644 (file)
--- a/tests/d_xattr_sorting/script
+++ b/tests/d_xattr_sorting/script
@@ -10,66 +10,59 @@ VERIFY_FSCK_OPT=-yf
 TEST_DATA=$test_name.tmp
 VERIFY_DATA=$test_name.ver.tmp
 
-echo "debugfs sort extended attributes" > $OUT
+echo "debugfs sort extended attributes" > $OUT.new
 
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
-echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
+echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT.new
 
 $MKE2FS -Fq -b 1024 $TMPFILE 512 > /dev/null 2>&1
 status=$?
-echo Exit status is $status >> $OUT
+echo Exit status is $status >> $OUT.new
 
 B=$(mktemp ${TMPDIR:-/tmp}/b.XXXXXX)
 
 perl -e 'print "x" x 256;' > $B
 
-echo "ea_set -f /tmp/b / security.SMEG64" > $OUT.new
+echo "ea_set -f /tmp/b / security.SMEG64" >> $OUT.new
 $DEBUGFS -w -R "ea_set -f $B / security.SMEG64" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_set -f /tmp/b / security.imb" > $OUT.new
+echo "ea_set -f /tmp/b / security.imb" >> $OUT.new
 $DEBUGFS -w -R "ea_set -f $B / security.imb" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_set / user.moo cow" > $OUT.new
+echo "ea_set / user.moo cow" >> $OUT.new
 $DEBUGFS -w -R "ea_set / user.moo cow" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
 rm -f $B
 unset B
 
-echo "ea_list /" > $OUT.new
+echo "ea_list /" >> $OUT.new
 $DEBUGFS -w -R "ea_list /" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get / security.imb" > $OUT.new
+echo "ea_get / security.imb" >> $OUT.new
 $DEBUGFS -w -R "ea_get / security.imb" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get / security.SMEG64" > $OUT.new
+echo "ea_get / security.SMEG64" >> $OUT.new
 $DEBUGFS -w -R "ea_get / security.SMEG64" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_get / nosuchea" > $OUT.new
+echo "ea_get / nosuchea" >> $OUT.new
 $DEBUGFS -w -R "ea_get / nosuchea" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
+echo e2fsck $VERIFY_FSCK_OPT -N test_filesys >> $OUT.new
 $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new

diff --git a/tests/f_badcluster/script b/tests/f_badcluster/script
index 0012594acfa0e196eba2bb44a7819e825b4014bb..6c9e1cf0e68782caf7adf8f50927743b3b65a336 100644 (file)
--- a/tests/f_badcluster/script
+++ b/tests/f_badcluster/script
@@ -7,13 +7,14 @@ IMAGE=$test_dir/../f_badcluster/image.gz
 OUT=$test_name.log
 EXP=$test_dir/expect
 gzip -d < $IMAGE > $TMPFILE
-$FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $OUT
-$FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-$FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-for i in a b c d e f g; do echo "stat /$i"; done > $TMPFILE.tmp
-echo "quit" >> $TMPFILE.tmp
-$DEBUGFS -f $TMPFILE.tmp $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.tmp
+$FSCK -fy $TMPFILE > $OUT.new 2>&1
+$FSCK -fy $TMPFILE >> $OUT.new 2>&1
+$FSCK -fy $TMPFILE >> $OUT.new 2>&1
+for i in a b c d e f g; do echo "stat /$i"; done > $TMPFILE.cmd
+echo "quit" >> $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/f_boundscheck/script b/tests/f_boundscheck/script
index fbbce62b7f74ae3575ff5125368c0647d51ecad9..7a07265e038bfeebb7afbfadb544b691a04f9539 100755 (executable)
--- a/tests/f_boundscheck/script
+++ b/tests/f_boundscheck/script
@@ -9,7 +9,6 @@ bzip2 -d < $IMAGE > $TMPFILE
 # Run fsck to fix things?
 EXP1=$test_dir/expect.1
 OUT1=$test_name.1.log
-rm -rf $test_name.failed $test_name.ok
 
 $FSCK $FSCK_OPT $TMPFILE 2>&1 | head -n 1000 | tail -n +2 > $OUT1
 echo "Exit status is $?" >> $OUT1

diff --git a/tests/f_collapse_extent_tree/script b/tests/f_collapse_extent_tree/script
index b4892000f8e1b844bf5dd33e68d6c0beff4978b9..daea6a8fe3806c55b04118f08a94141d12e70917 100644 (file)
--- a/tests/f_collapse_extent_tree/script
+++ b/tests/f_collapse_extent_tree/script
@@ -43,17 +43,15 @@ if [ "$SKIP_GUNZIP" != "true" ] ; then
        gunzip < $IMAGE > $TMPFILE
 fi
 
-cp /dev/null $OUT1
-
 eval $PREP_CMD
 
 echo 'ex /a' > $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE > $OUT1.new 2>&1
-rm -rf $TMPFILE.cmd
+rm -f $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 $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new > $OUT1
 rm -f $OUT1.new
 
 if [ "$ONE_PASS_ONLY" != "true" ]; then
@@ -62,9 +60,8 @@ if [ "$ONE_PASS_ONLY" != "true" ]; then
        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 $OUT2.new > $OUT2
-       rm -f $OUT2.new
+       rm -f $TMPFILE.cmd $OUT2.new
 fi
 
 eval $AFTER_CMD

diff --git a/tests/f_compress_extent_tree_level/script b/tests/f_compress_extent_tree_level/script
index b4892000f8e1b844bf5dd33e68d6c0beff4978b9..c5ffa222bd86b9d6b504a00a389fc2c9fdece99e 100644 (file)
--- a/tests/f_compress_extent_tree_level/script
+++ b/tests/f_compress_extent_tree_level/script
@@ -49,11 +49,11 @@ eval $PREP_CMD
 
 echo 'ex /a' > $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE > $OUT1.new 2>&1
-rm -rf $TMPFILE.cmd
+rm -f $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 $OUT1.new >> $OUT1
+sed -f $cmd_dir/filter.sed $OUT1.new > $OUT1
 rm -f $OUT1.new
 
 if [ "$ONE_PASS_ONLY" != "true" ]; then
@@ -62,9 +62,8 @@ if [ "$ONE_PASS_ONLY" != "true" ]; then
        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 $OUT2.new > $OUT2
-       rm -f $OUT2.new
+       rm -f $TMPFILE.cmd $OUT2.new
 fi
 
 eval $AFTER_CMD

diff --git a/tests/f_convert_bmap/script b/tests/f_convert_bmap/script
index 79dd79cf2140d95e1ef379e947efcfbbe55805da..960a2f8dc6b807e625f6cadbf44a91c4b4d393a9 100644 (file)
--- a/tests/f_convert_bmap/script
+++ b/tests/f_convert_bmap/script
@@ -49,22 +49,20 @@ eval $PREP_CMD
 
 echo 'stat /a' > $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE > $OUT1.new 2>&1
-rm -rf $TMPFILE.cmd
+rm -f $TMPFILE.cmd
 $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 $OUT1.new >> $OUT1
-rm -f $OUT1.new
+sed -f $cmd_dir/filter.sed $OUT1.new > $OUT1
 
 $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
 status=$?
 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 $OUT2.new > $OUT2
-rm -f $OUT2.new
+rm -f $TMPFILE.cmd $OUT1.new $OUT2.new
 
 eval $AFTER_CMD
 

diff --git a/tests/f_convert_bmap_and_extent/script b/tests/f_convert_bmap_and_extent/script
index 33f177a50f5c953ec23e39046c62c2dc173dd30a..f61c8e2e3448d833bbb07b98ba0857f1f05c230f 100644 (file)
--- a/tests/f_convert_bmap_and_extent/script
+++ b/tests/f_convert_bmap_and_extent/script
@@ -50,13 +50,12 @@ eval $PREP_CMD
 echo 'stat /a' > $TMPFILE.cmd
 echo 'ex /zero' >> $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE > $OUT1.new 2>&1
-rm -rf $TMPFILE.cmd
+rm -f $TMPFILE.cmd
 $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 $OUT1.new >> $OUT1
-rm -f $OUT1.new
+sed -f $cmd_dir/filter.sed $OUT1.new > $OUT1
 
 $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
 status=$?
@@ -64,9 +63,8 @@ echo Exit status is $status >> $OUT2.new
 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 $OUT2.new > $OUT2
-rm -f $OUT2.new
+rm -f $TMPFILE.cmd $OUT1.new $OUT2.new
 
 eval $AFTER_CMD
 

diff --git a/tests/f_convert_bmap_sparse/script b/tests/f_convert_bmap_sparse/script
index 4315929796e54add6c69d894360af841c86a0867..e78a4bdbd382d9638f89c35bdbb3d1ac21eec5e8 100644 (file)
--- a/tests/f_convert_bmap_sparse/script
+++ b/tests/f_convert_bmap_sparse/script
@@ -49,22 +49,20 @@ eval $PREP_CMD
 
 echo 'stat /realmode.bin' > $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE > $OUT1.new 2>&1
-rm -rf $TMPFILE.cmd
+rm -f $TMPFILE.cmd
 $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 $OUT1.new >> $OUT1
-rm -f $OUT1.new
+sed -f $cmd_dir/filter.sed $OUT1.new > $OUT1
 
 $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
 status=$?
 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 $OUT2.new > $OUT2
-rm -f $OUT2.new
+rm -f $TMPFILE.cmd $OUT1.new $OUT2.new
 
 eval $AFTER_CMD
 

diff --git a/tests/f_create_symlinks/script b/tests/f_create_symlinks/script
index 933973f1b4595cee414d7e422caa94ad06483479..169f58dbed2f9249dee79bfb6ff5eb3196d31e2c 100644 (file)
--- a/tests/f_create_symlinks/script
+++ b/tests/f_create_symlinks/script
@@ -12,39 +12,32 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 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 >> $OUT
+echo mke2fs -q -F -o Linux -b 1024 -g 256 -O inline_data,extents -I 256 test.img 1024 > $OUT.new
+$MKE2FS -q -F -o Linux -b 1024 -g 256 -O inline_data,extents -I 256 $TMPFILE 1024 >> $OUT 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 for i in 30 60 70 500 1023 1024 1500; do
-       echo "debugfs -R \"symlink /l_$i $(perl -e "print 'x' x $i;")\" test.img" >> $OUT
+       echo "debugfs -R \"symlink /l_$i $(perl -e "print 'x' x $i;")\" test.img" >> $OUT.new
        $DEBUGFS -w -R "symlink /l_$i $(perl -e "print 'x' x $i;")" $TMPFILE \
-                2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+                2>&1 | sed -f $cmd_dir/filter.sed >> $OUT.new
 done
 
 for i in 30 60 70 500 1023 1024 1500; do
-       echo "debugfs -R \"stat /l_$i\" test.img" >> $OUT
+       echo "debugfs -R \"stat /l_$i\" test.img" >> $OUT.new
        $DEBUGFS -R "stat /l_$i" $TMPFILE 2>&1 | \
-                sed -f $cmd_dir/filter.sed | grep -v "time: " >> $OUT
+                grep -v "time: " >> $OUT.new
 done
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+rm -f $OUT.new $TMPFILE
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/f_detect_junk/script b/tests/f_detect_junk/script
index 53d9bac7327c58baf1cea8c090ca1d5233cde2bf..2577842f58fe7426ca36687541874e4d75686cd4 100644 (file)
--- a/tests/f_detect_junk/script
+++ b/tests/f_detect_junk/script
@@ -18,7 +18,7 @@ else
        EXP=$test_dir/expect.nodebugfs
 fi
 OUT=$test_name.log
-rm -rf $test_name.failed $test_name.ok
+rm -f $test_name.failed $test_name.ok
 
 echo "*** e2fsck" > $OUT
 $FSCK $FSCK_OPT $TMPFILE >> $OUT 2>&1

diff --git a/tests/f_detect_xfs/script b/tests/f_detect_xfs/script
index abd5da87f6509a77d772e6f44e912126e6aad7f5..bd2c1e8c47e1f1d8836f1666d967b8a2c9ce0a32 100644 (file)
--- a/tests/f_detect_xfs/script
+++ b/tests/f_detect_xfs/script
@@ -12,7 +12,7 @@ else
        EXP=$test_dir/expect.nodebugfs
 fi
 OUT=$test_name.log
-rm -rf $test_name.failed $test_name.ok
+rm -f $test_name.failed $test_name.ok
 
 echo "*** e2fsck" > $OUT
 $FSCK $FSCK_OPT $TMPFILE >> $OUT 2>&1

diff --git a/tests/f_extent_too_deep/script b/tests/f_extent_too_deep/script
index b4892000f8e1b844bf5dd33e68d6c0beff4978b9..b32c36f13c142523178f1489ef31773f3b98dbd4 100644 (file)
--- a/tests/f_extent_too_deep/script
+++ b/tests/f_extent_too_deep/script
@@ -43,18 +43,14 @@ if [ "$SKIP_GUNZIP" != "true" ] ; then
        gunzip < $IMAGE > $TMPFILE
 fi
 
-cp /dev/null $OUT1
-
 eval $PREP_CMD
 
 echo 'ex /a' > $TMPFILE.cmd
 $DEBUGFS -f $TMPFILE.cmd $TMPFILE > $OUT1.new 2>&1
-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 $OUT1.new >> $OUT1
-rm -f $OUT1.new
+sed -f $cmd_dir/filter.sed $OUT1.new > $OUT1
 
 if [ "$ONE_PASS_ONLY" != "true" ]; then
        $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 
@@ -62,10 +58,9 @@ if [ "$ONE_PASS_ONLY" != "true" ]; then
        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 $OUT2.new > $OUT2
-       rm -f $OUT2.new
 fi
+rm -f $TMPFILE.cmd $OUT1.new $OUT2.new
 
 eval $AFTER_CMD
 

diff --git a/tests/f_itable_collision/script b/tests/f_itable_collision/script
index 52b69a285de877c4cd1f310ccda272523a49d4d6..66abd9022ae4fa214906eef60b5a2f641bb4d102 100755 (executable)
--- a/tests/f_itable_collision/script
+++ b/tests/f_itable_collision/script
@@ -14,7 +14,6 @@ gzip -d < $IMAGE > $TMPFILE
 # Run fsck to fix things?
 EXP1=$test_dir/expect.1
 OUT1=$test_name.1.log
-rm -rf $test_name.failed $test_name.ok
 
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | tail -n +2 > $OUT1
 echo "Exit status is $?" >> $OUT1

diff --git a/tests/f_large_dir/script b/tests/f_large_dir/script
index 605706ce203832c7337d7448de50f41d83dc3e29..e3151817dcd5c8ac2ca5f27dfcc88339b40eeaa5 100644 (file)
--- a/tests/f_large_dir/script
+++ b/tests/f_large_dir/script
@@ -12,7 +12,6 @@ INDEX_L1=$(((BLOCKSZ - HEADER) / INDEX_SZ))
 INDEX_L2=$(((BLOCKSZ - DIRENT_SZ) / INDEX_SZ))
 ENTRIES=$((INDEX_L1 * INDEX_L2 * DIRENT_PER_LEAF))
 
-cp /dev/null $OUT
 $MKE2FS -b 1024 -O large_dir,uninit_bg,dir_nlink -F $TMPFILE 460800 \
        > /dev/null 2>&1
 {
@@ -27,7 +26,7 @@ $MKE2FS -b 1024 -O large_dir,uninit_bg,dir_nlink -F $TMPFILE 460800 \
                echo "expand ./"
            fi
            if test $(( i % 5000 )) -eq 0 -a $i -gt 0 ; then
-               >&2 echo "$test_name: $i processed"
+               >&2 echo "$test_name: $i/$ENTRIES processed"
            fi
            printf "ln foofile %0255X\n" $i
            i=$(($i + 1))
@@ -37,7 +36,7 @@ $MKE2FS -b 1024 -O large_dir,uninit_bg,dir_nlink -F $TMPFILE 460800 \
 $E2FSCK -yfD $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 -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
 rm -f $OUT.new
 
 cmp -s $OUT $EXP

diff --git a/tests/f_no/script b/tests/f_no/script
index 2a67e77a797ad5479ca7a7ee51f77876bc2d233d..c046d76f115b487f2e225e8fc4de5a1c4efd11b9 100644 (file)
--- a/tests/f_no/script
+++ b/tests/f_no/script
@@ -5,11 +5,10 @@ EXP=$test_dir/expect
 
 gunzip < $test_dir/../f_yesall/image.gz > $TMPFILE
 
-rm -rf $OUT
 echo "nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" | E2FSCK_FORCE_INTERACTIVE=y $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 $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 rm -f $OUT.new
 
 cmp -s $OUT $EXP

diff --git a/tests/f_opt_extent/script b/tests/f_opt_extent/script
index f2228dcfc9a2e61f1015eb4662f5c1630150583c..836698376f8b3f527ca171227ac1d57c485212f7 100644 (file)
--- a/tests/f_opt_extent/script
+++ b/tests/f_opt_extent/script
@@ -22,7 +22,7 @@ ENDL
 echo "tune2fs metadata_csum test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 $DUMPE2FS $TMPFILE 2> /dev/null | grep '^Group 0:' -B99 -A20 | sed -f $cmd_dir/filter.sed > $OUT.before

diff --git a/tests/f_opt_extent_ext3/script b/tests/f_opt_extent_ext3/script
index 4dace4e510786fbd5647c8f947c65452aa04fd90..51fbceef0b86a695caac10a0ca5ba0d7bf36eb2d 100644 (file)
--- a/tests/f_opt_extent_ext3/script
+++ b/tests/f_opt_extent_ext3/script
@@ -23,7 +23,7 @@ ENDL
 echo "rebuild extent metadata_csum test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 $DUMPE2FS $TMPFILE 2> /dev/null | grep '^Group 0:' -B99 -A20 | sed -f $cmd_dir/filter.sed > $OUT.before

diff --git a/tests/f_readonly_fsck/script b/tests/f_readonly_fsck/script
index 8e67e1fe522d94848db379a01f2618624054d015..528199d91a2d38588a62a38d0e5a81c53beb5f61 100644 (file)
--- a/tests/f_readonly_fsck/script
+++ b/tests/f_readonly_fsck/script
@@ -7,8 +7,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 gzip -d < $test_dir/image.gz > $TMPFILE
@@ -18,18 +16,17 @@ 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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 new="$($CRCSUM < $TMPFILE)"
 
 if [ "${old}" != "${new}" ]; then
-       echo "ERROR: crc mismatch!  ${old} ${new}" >> $OUT
+       echo "ERROR: crc mismatch!  ${old} ${new}" >> $OUT.new
 else
-       echo "crc did not change.  ${old}" >> $OUT
+       echo "crc did not change.  ${old}" >> $OUT.new
 fi
 
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/f_resize_inode/script b/tests/f_resize_inode/script
index a4f1949a50afb6edc0bd1e7f3abc3ba813516ce4..58915a74e0de73b4cf264547c7b009a0b7910bc7 100644 (file)
--- a/tests/f_resize_inode/script
+++ b/tests/f_resize_inode/script
@@ -13,120 +13,93 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 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 >> $OUT
+echo mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT.new
+$MKE2FS -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo ----------------------------------------------- >> $OUT
+echo ----------------------------------------------- >> $OUT.new
 
-echo " " >> $OUT
-echo "debugfs -R ''set_inode_field <7> block[2] 42'' -w test.img" > $OUT.new
+echo " " >> $OUT.new
+echo "debugfs -R ''set_inode_field <7> block[2] 42'' -w test.img" >> $OUT.new
 $DEBUGFS -R "set_inode_field <7> block[2] 42" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo ----------------------------------------------- >> $OUT
+echo ----------------------------------------------- >> $OUT.new
 
-echo " " >> $OUT
-echo "debugfs -R ''clri <7>'' -w test.img" > $OUT.new
+echo " " >> $OUT.new
+echo "debugfs -R ''clri <7>'' -w test.img" >> $OUT.new
 $DEBUGFS -R "clri <7>" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo ----------------------------------------------- >> $OUT
+echo ----------------------------------------------- >> $OUT.new
 
-echo " " >> $OUT
-echo "debugfs -R ''set_inode_field <7> bmap[524] 57'' -w test.img" > $OUT.new
+echo " " >> $OUT.new
+echo "debugfs -R ''set_inode_field <7> bmap[524] 57'' -w test.img" >> $OUT.new
 $DEBUGFS -R "set_inode_field <7> bmap[524] 57" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo ----------------------------------------------- >> $OUT
+echo ----------------------------------------------- >> $OUT.new
 
-echo " " >> $OUT
-echo "debugfs -R ''set_super_value reserved_gdt_blocks 15679'' -w test.img" > $OUT.new
+echo " " >> $OUT.new
+echo "debugfs -R ''set_super_value reserved_gdt_blocks 15679'' -w test.img" >> $OUT.new
 $DEBUGFS -R "set_super_value reserved_gdt_blocks 15679" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-echo ----------------------------------------------- >> $OUT
+echo ----------------------------------------------- >> $OUT.new
 
-echo " " >> $OUT
-echo "debugfs -R ''set_super_value reserved_gdt_blocks 32'' -w test.img" > $OUT.new
+echo " " >> $OUT.new
+echo "debugfs -R ''set_super_value reserved_gdt_blocks 32'' -w test.img" >> $OUT.new
 $DEBUGFS -R "set_super_value reserved_gdt_blocks 32" -w $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 rm -f $OUT.new
 
-
 cmp -s $OUT $EXP
 status=$?
 

diff --git a/tests/f_super_bad_csum/script b/tests/f_super_bad_csum/script
index cfd41894c3f106829db700877cf9c80845ed74a7..5c899625111f2fa44c8d14e84cbcf2a80738e029 100755 (executable)
--- a/tests/f_super_bad_csum/script
+++ b/tests/f_super_bad_csum/script
@@ -9,7 +9,7 @@ bzip2 -d < $IMAGE > $TMPFILE
 # Run fsck to fix things?
 EXP1=$test_dir/expect.1
 OUT1=$test_name.1.log
-rm -rf $test_name.failed $test_name.ok
+rm -f $test_name.failed $test_name.ok
 
 $FSCK $FSCK_OPT $TMPFILE 2>&1 | head -n 1000 | tail -n +2 > $OUT1
 echo "Exit status is $?" >> $OUT1

diff --git a/tests/f_uninit_cat/script b/tests/f_uninit_cat/script
index 8d56e849648705ce44b92923fbcd807ff2e4c07d..f2443fa3b202bd215833ccc4bdbc4ffc2f111a70 100755 (executable)
--- a/tests/f_uninit_cat/script
+++ b/tests/f_uninit_cat/script
@@ -13,18 +13,17 @@ gzip -d < $IMAGE > $TMPFILE
 # Run fsck to fix things?
 EXP=$test_dir/expect
 OUT=$test_name.log
-rm -rf $test_name.failed $test_name.ok
 
-$FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $OUT
-echo "Exit status is $?" >> $OUT
+$FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 > $OUT.new
+echo "Exit status is $?" >> $OUT.new
 
-echo "debugfs cat uninit file" >> $OUT
+echo "debugfs cat uninit file" >> $OUT.new
 echo "ex /a" > $TMPFILE.cmd
 echo "cat /a" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 echo >> $OUT.new
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new $TMPFILE $TMPFILE.cmd
+sed -f $cmd_dir/filter.sed < $OUT.new > $OUT
+rm -f $OUT.new $TMPFILE $TMPFILE.cmd
 
 # Figure out what happened
 if cmp -s $EXP $OUT; then

diff --git a/tests/f_yes/script b/tests/f_yes/script
index 4e114c50973ad987adbaebc9ffa99e87b1f1570e..3cbeb20b2c42f80fd1a1f7ba533905d6d65beeb0 100644 (file)
--- a/tests/f_yes/script
+++ b/tests/f_yes/script
@@ -5,11 +5,10 @@ EXP=$test_dir/expect
 
 gunzip < $test_dir/../f_yesall/image.gz > $TMPFILE
 
-rm -rf $OUT
 echo "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy" | E2FSCK_FORCE_INTERACTIVE=y $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 $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 rm -f $OUT.new
 
 cmp -s $OUT $EXP

diff --git a/tests/f_yesall/script b/tests/f_yesall/script
index c3721ffd75cf76eb1735056ffecc1d7ca79fa675..cb67ee7c55b87fa37f45dcbbde9d792622708034 100644 (file)
--- a/tests/f_yesall/script
+++ b/tests/f_yesall/script
@@ -5,11 +5,10 @@ EXP=$test_dir/expect
 
 gunzip < $test_dir/image.gz > $TMPFILE
 
-rm -rf $OUT
 echo "annnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" | E2FSCK_FORCE_INTERACTIVE=y $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 $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 rm -f $OUT.new
 
 cmp -s $OUT $EXP

diff --git a/tests/f_yesthenall/script b/tests/f_yesthenall/script
index eb11c2314985015c59d5e1eed3dfc70a795a68c0..5f4c8ee2be9f089e59550dbd63aff290411c5dc1 100644 (file)
--- a/tests/f_yesthenall/script
+++ b/tests/f_yesthenall/script
@@ -5,11 +5,10 @@ EXP=$test_dir/expect
 
 gunzip < $test_dir/../f_yesall/image.gz > $TMPFILE
 
-rm -rf $OUT
 echo "yyyyyyyyyyannnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" | E2FSCK_FORCE_INTERACTIVE=y $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 $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 rm -f $OUT.new
 
 cmp -s $OUT $EXP

diff --git a/tests/f_yesthenno/script b/tests/f_yesthenno/script
index f41b78b5868f914cc39bc6e9779fb8988511b8b3..5bbc0c6a4ce19142c1f487dd111aa4520b768a94 100644 (file)
--- a/tests/f_yesthenno/script
+++ b/tests/f_yesthenno/script
@@ -5,11 +5,10 @@ EXP=$test_dir/expect
 
 gunzip < $test_dir/../f_yesall/image.gz > $TMPFILE
 
-rm -rf $OUT
 echo "yyyyyyyyyynnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" | E2FSCK_FORCE_INTERACTIVE=y $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 $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
 rm -f $OUT.new
 
 cmp -s $OUT $EXP

diff --git a/tests/i_bad_csum/script b/tests/i_bad_csum/script
index 4c38cf4e167ebdf7e036bd55611878eb9e293d18..8b5bef97c2f110501a37407fbad3b233fae099e6 100644 (file)
--- a/tests/i_bad_csum/script
+++ b/tests/i_bad_csum/script
@@ -5,7 +5,7 @@ OUT=$test_name.log
 EXP=$test_dir/expect
 
 gzip -d < $IMAGE > $TMPFILE
-$E2IMAGE -r $TMPFILE $TMPFILE.bin >> $OUT 2>&1
+$E2IMAGE -r $TMPFILE $TMPFILE.bin > $OUT 2>&1
 $FSCK -fn $TMPFILE.bin >> $OUT 2>&1
 
 sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test_filesys;" $OUT > $OUT.new
@@ -22,5 +22,5 @@ else
         rm -f $test_name.tmp
 fi
 
-rm -rf $OUT $TMPFILE $TMPFILE.bin $TMPFILE.test
+rm -f $OUT $TMPFILE $TMPFILE.bin $TMPFILE.test
 unset IMAGE FSCK_OPT OUT EXP

diff --git a/tests/j_corrupt_commit_csum/script b/tests/j_corrupt_commit_csum/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_commit_csum/script
+++ b/tests/j_corrupt_commit_csum/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_commit_tid/script b/tests/j_corrupt_commit_tid/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_commit_tid/script
+++ b/tests/j_corrupt_commit_tid/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_descr_csum/script b/tests/j_corrupt_descr_csum/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_descr_csum/script
+++ b/tests/j_corrupt_descr_csum/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_descr_tid/script b/tests/j_corrupt_descr_tid/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_descr_tid/script
+++ b/tests/j_corrupt_descr_tid/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_ext_jnl_sb_block/script b/tests/j_corrupt_ext_jnl_sb_block/script
index 11d3001b4b9068baa1df8b9e0379c23f7c65af7c..b038943e62f463cad4dcb91c20715f3ea4e74f86 100644 (file)
--- a/tests/j_corrupt_ext_jnl_sb_block/script
+++ b/tests/j_corrupt_ext_jnl_sb_block/script
@@ -7,8 +7,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 bzip2 -dc < $test_dir/image.tar.bz2 | tar xf -
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img "$JOURNAL_DUMP_DIR/$test_name.img"
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img.jnl "$JOURNAL_DUMP_DIR/$test_name.img.jnl"
@@ -16,10 +14,8 @@ test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img.jnl "
 $FSCK $FSCK_OPT -N test_filesys -j $test_name.img.jnl $test_name.img > $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
-rm -f $OUT.new
-
-rm -f $TMPFILE $test_name.img $test_name.img.jnl
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $test_name.img $test_name.img.jnl $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_ext_jnl_sb_csum/script b/tests/j_corrupt_ext_jnl_sb_csum/script
index 45ddf6f4ff1fdd28edd24079eff951eaa1b72dc0..6c0256b64bc7da615121c157e1f6584c86790221 100644 (file)
--- a/tests/j_corrupt_ext_jnl_sb_csum/script
+++ b/tests/j_corrupt_ext_jnl_sb_csum/script
@@ -7,8 +7,6 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 bzip2 -dc < $test_dir/image.tar.bz2 | tar xf -
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img "$JOURNAL_DUMP_DIR/$test_name.img"
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img.jnl "$JOURNAL_DUMP_DIR/$test_name.img.jnl"
@@ -16,16 +14,12 @@ test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img.jnl "
 $FSCK $FSCK_OPT -N test_filesys -j $test_name.img.jnl $test_name.img > $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
-rm -f $OUT.new
 
-$FSCK $FSCK_OPT -N test_filesys -j $test_name.img.jnl $test_name.img > $OUT.new 2>&1
+$FSCK $FSCK_OPT -N test_filesys -j $test_name.img.jnl $test_name.img >> $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
-rm -f $OUT.new
-
-rm -f $TMPFILE $test_name.img $test_name.img.jnl
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $test_name.img $test_name.img.jnl $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_journal_block/script b/tests/j_corrupt_journal_block/script
index a881bd1c9a1c8be4171ebe0a3b2d8744857764d9..a3808056430cd38edf1e90369bc394035bf76e78 100644 (file)
--- a/tests/j_corrupt_journal_block/script
+++ b/tests/j_corrupt_journal_block/script
@@ -13,29 +13,22 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
 echo >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_revoke_block/script b/tests/j_corrupt_revoke_block/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_revoke_block/script
+++ b/tests/j_corrupt_revoke_block/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_revoke_csum/script b/tests/j_corrupt_revoke_csum/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_revoke_csum/script
+++ b/tests/j_corrupt_revoke_csum/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_sb_csum/script b/tests/j_corrupt_sb_csum/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_sb_csum/script
+++ b/tests/j_corrupt_sb_csum/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_corrupt_sb_magic/script b/tests/j_corrupt_sb_magic/script
index 57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f..ab314f69288c48c824a34e0a0e42cc521556a39d 100644 (file)
--- a/tests/j_corrupt_sb_magic/script
+++ b/tests/j_corrupt_sb_magic/script
@@ -13,28 +13,21 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gzip -d < $IMAGE > $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
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -f $TMPFILE.cmd
-
-rm -f $TMPFILE
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_ext_dumpe2fs/script b/tests/j_ext_dumpe2fs/script
index 1611c45e4dbfefe459ad8673679a041827c503cf..b7bae59c188bfc784178f0a2945838412f64f9c5 100644 (file)
--- a/tests/j_ext_dumpe2fs/script
+++ b/tests/j_ext_dumpe2fs/script
@@ -7,23 +7,17 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 gunzip < $test_dir/image.gz > $TMPFILE
 
-echo "e2fsck external journal" >> $OUT
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+echo "e2fsck external journal" > $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
-rm -f $OUT.new
-
-echo "dumpe2fs external journal" >> $OUT
-$DUMPE2FS $TMPFILE > $OUT.new 2>&1
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
-rm -f $OUT.new
 
-rm -f $TMPFILE
+echo "dumpe2fs external journal" >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_ext_long_revoke_trans/script b/tests/j_ext_long_revoke_trans/script
index 21518edc49989853ddc78ea4d0b5dbb60fb7eb93..c99c8f129dfd6240a51c0ed1013ec4cf01ddc4ef 100644 (file)
--- a/tests/j_ext_long_revoke_trans/script
+++ b/tests/j_ext_long_revoke_trans/script
@@ -12,30 +12,24 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 JNLFILE=$TMPFILE.jnl
 
 touch $JNLFILE
-$MKE2FS -F -o Linux -b 1024 -O journal_dev -T ext4 -U 1db3f677-6832-4adb-bafc-8e4059c30a34 $JNLFILE 262144 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-$MKE2FS -F -o Linux -b 1024 -O ^has_journal -T ext4 $TMPFILE 262144 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
+$MKE2FS -F -o Linux -b 1024 -O journal_dev -T ext4 -U 1db3f677-6832-4adb-bafc-8e4059c30a34 $JNLFILE 262144 > $OUT.new 2>&1
+$MKE2FS -F -o Linux -b 1024 -O ^has_journal -T ext4 $TMPFILE 262144 >> $OUT.new 2>&1
 
-echo "debugfs add journal device/UUID" >> $OUT
+echo "debugfs add journal device/UUID" >> $OUT.new
 $DEBUGFS -w -f - $TMPFILE <<-EOF >> $OUT.new 2>&1
        feature has_journal
        ssv journal_dev 0x9999
        ssv journal_uuid 1db3f677-6832-4adb-bafc-8e4059c30a34
 EOF
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys -j $JNLFILE $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys -j $JNLFILE $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
-rm -f $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -f $JNLFILE" > $TMPFILE.cmd
 echo "jw -b 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
@@ -43,23 +37,18 @@ echo "jo -f $JNLFILE" >> $TMPFILE.cmd
 echo "jw -r 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$JNLFILE" "$JOURNAL_DUMP_DIR/$test_name.img.jnl"
 echo "logdump -c -f $JNLFILE" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-echo "debugfs fsck" >> $OUT
-$FSCK -fy -N test_filesys -j $JNLFILE $TMPFILE > $OUT.new 2>&1
+echo "debugfs fsck" >> $OUT.new
+$FSCK -fy -N test_filesys -j $JNLFILE $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
-rm -f $OUT.new
-
-rm -f $TMPFILE $JNLFILE
+sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $JNLFILE $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_ext_long_trans/script b/tests/j_ext_long_trans/script
index 5f7fa53589d023db586d1001a61ac488319d7402..f19fb89204b4c484c4755c3bd3a060dbe7c47f56 100644 (file)
--- a/tests/j_ext_long_trans/script
+++ b/tests/j_ext_long_trans/script
@@ -12,51 +12,40 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 JNLFILE=$TMPFILE.jnl
 
 touch $JNLFILE
-$MKE2FS -F -o Linux -b 1024 -O journal_dev -T ext4 -U 1db3f677-6832-4adb-bafc-8e4059c30a34 $JNLFILE 262144 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-$MKE2FS -F -o Linux -b 1024 -O ^has_journal -T ext4 $TMPFILE 262144 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
+$MKE2FS -F -o Linux -b 1024 -O journal_dev -T ext4 -U 1db3f677-6832-4adb-bafc-8e4059c30a34 $JNLFILE 262144 > $OUT.new 2>&1
+$MKE2FS -F -o Linux -b 1024 -O ^has_journal -T ext4 $TMPFILE 262144 >> $OUT.new 2>&1
 
-echo "debugfs add journal device/UUID" >> $OUT
+echo "debugfs add journal device/UUID" >> $OUT.new
 $DEBUGFS -w -f - $TMPFILE <<- EOF >> $OUT.new 2>&1
        feature has_journal
        ssv journal_dev 0x9999
        ssv journal_uuid 1db3f677-6832-4adb-bafc-8e4059c30a34
 EOF
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
-rm -f $OUT.new
 
-$FSCK -fy -N test_filesys -j $JNLFILE $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys -j $JNLFILE $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
-rm -f $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -f $JNLFILE" > $TMPFILE.cmd
 echo "jw -b 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$JNLFILE" "$JOURNAL_DUMP_DIR/$test_name.img.jnl"
 echo "logdump -c -f $JNLFILE" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-echo "debugfs fsck" >> $OUT
-$FSCK -fy -N test_filesys -j $JNLFILE $TMPFILE > $OUT.new 2>&1
+echo "debugfs fsck" >> $OUT.new
+$FSCK -fy -N test_filesys -j $JNLFILE $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
-rm -f $OUT.new
-
-rm -f $TMPFILE $JNLFILE
+sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $JNLFILE $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_long_revoke_trans/script b/tests/j_long_revoke_trans/script
index bc330259aafb28e0f698be5f4f40a39c00ee785f..d59578d631473881937d7ecb91e3a4a0517f5586 100644 (file)
--- a/tests/j_long_revoke_trans/script
+++ b/tests/j_long_revoke_trans/script
@@ -12,17 +12,13 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 1024 -O has_journal -T ext4 $TMPFILE 262144 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 1024 -O has_journal -T ext4 $TMPFILE 262144 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
@@ -30,21 +26,16 @@ echo "jo" >> $TMPFILE.cmd
 echo "jw -r 259-4356" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_long_revoke_trans_mcsum_32bit/script b/tests/j_long_revoke_trans_mcsum_32bit/script
index 3e838ac915b76b1e3a945645d0a0b2a3748592e7..8e5a029e20a49ed8cc980c4d8e35c6a0d34f937e 100644 (file)
--- a/tests/j_long_revoke_trans_mcsum_32bit/script
+++ b/tests/j_long_revoke_trans_mcsum_32bit/script
@@ -12,44 +12,34 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 1024 -O ^64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 1024 -O ^64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b 260-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r 260-4356" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-#$DEBUGFS -w $TMPFILE -f $TMPFILE.cmd >> $OUT 2>&1
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_long_revoke_trans_mcsum_64bit/script b/tests/j_long_revoke_trans_mcsum_64bit/script
index eef9f0208be2e7747296fee5c4d2e8f7b1ddc44e..4bc09626ec024eedf0f6a8d679dc80b515e8e446 100644 (file)
--- a/tests/j_long_revoke_trans_mcsum_64bit/script
+++ b/tests/j_long_revoke_trans_mcsum_64bit/script
@@ -12,44 +12,34 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 1024 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 1024 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b 262-4358 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r 262-4358" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-#$DEBUGFS -w $TMPFILE -f $TMPFILE.cmd >> $OUT 2>&1
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_long_trans/script b/tests/j_long_trans/script
index 425bf991cdc2e3a2d4c9ca836b299a4dd6f9d424..ff4dab332b982c91880ab5d9f83b0a071128f74e 100644 (file)
--- a/tests/j_long_trans/script
+++ b/tests/j_long_trans/script
@@ -12,36 +12,27 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 1024 -O has_journal -T ext4 $TMPFILE 262144 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 1024 -O has_journal -T ext4 $TMPFILE 262144 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_long_trans_mcsum_32bit/script b/tests/j_long_trans_mcsum_32bit/script
index f0297a4790fcc4800e35a05850aaf05c809a4e18..76da8cadaa420ed67949cc186c9aeb2c14b7dc6e 100644 (file)
--- a/tests/j_long_trans_mcsum_32bit/script
+++ b/tests/j_long_trans_mcsum_32bit/script
@@ -12,40 +12,31 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 1024 -O ^64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 1024 -O ^64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b 260-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_long_trans_mcsum_64bit/script b/tests/j_long_trans_mcsum_64bit/script
index a72f6f1b96c725b0973ae828e5d76e8cd9b66871..b68d1d5c02ad08faac657a2ca0748479d341d04e 100644 (file)
--- a/tests/j_long_trans_mcsum_64bit/script
+++ b/tests/j_long_trans_mcsum_64bit/script
@@ -12,40 +12,31 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 1024 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 1024 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 524288 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b 262-4358 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_recover_csum2_32bit/script b/tests/j_recover_csum2_32bit/script
index 4b0ec48e5a524895bde0521046a42bd8a666702e..cc736cabc59b368db0006588b4c10370b2d15859 100755 (executable)
--- a/tests/j_recover_csum2_32bit/script
+++ b/tests/j_recover_csum2_32bit/script
@@ -8,7 +8,6 @@ bzip2 -d < $IMAGE > $TMPFILE
 # Run fsck to fix things?
 EXP1=$test_dir/expect.1
 OUT1=$test_name.1.log
-rm -rf $test_name.failed $test_name.ok
 
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | head -n 1000 | tail -n +2 > $OUT1
 echo "Exit status is $?" >> $OUT1

diff --git a/tests/j_recover_csum2_64bit/script b/tests/j_recover_csum2_64bit/script
index 4b0ec48e5a524895bde0521046a42bd8a666702e..cc736cabc59b368db0006588b4c10370b2d15859 100755 (executable)
--- a/tests/j_recover_csum2_64bit/script
+++ b/tests/j_recover_csum2_64bit/script
@@ -8,7 +8,6 @@ bzip2 -d < $IMAGE > $TMPFILE
 # Run fsck to fix things?
 EXP1=$test_dir/expect.1
 OUT1=$test_name.1.log
-rm -rf $test_name.failed $test_name.ok
 
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | head -n 1000 | tail -n +2 > $OUT1
 echo "Exit status is $?" >> $OUT1

diff --git a/tests/j_recover_csum3_64bit/script b/tests/j_recover_csum3_64bit/script
index 4b0ec48e5a524895bde0521046a42bd8a666702e..cc736cabc59b368db0006588b4c10370b2d15859 100755 (executable)
--- a/tests/j_recover_csum3_64bit/script
+++ b/tests/j_recover_csum3_64bit/script
@@ -8,7 +8,6 @@ bzip2 -d < $IMAGE > $TMPFILE
 # Run fsck to fix things?
 EXP1=$test_dir/expect.1
 OUT1=$test_name.1.log
-rm -rf $test_name.failed $test_name.ok
 
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | head -n 1000 | tail -n +2 > $OUT1
 echo "Exit status is $?" >> $OUT1

diff --git a/tests/j_short_revoke_trans/script b/tests/j_short_revoke_trans/script
index 9d3ee0567f9383176478b4b86e90a243627a7a47..0e84e46156ee5e14611df2f1916bd99bf01cbf48 100644 (file)
--- a/tests/j_short_revoke_trans/script
+++ b/tests/j_short_revoke_trans/script
@@ -12,19 +12,15 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
@@ -32,21 +28,16 @@ echo "jo" >> $TMPFILE.cmd
 echo "jw -r $bitmaps" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_revoke_trans_mcsum_64bit/script b/tests/j_short_revoke_trans_mcsum_64bit/script
index c9cc7cd8eec709d30f7989fc02154159fc1e7220..9b97b11c013fbb3efc786ff244e774e5f27557c1 100644 (file)
--- a/tests/j_short_revoke_trans_mcsum_64bit/script
+++ b/tests/j_short_revoke_trans_mcsum_64bit/script
@@ -12,21 +12,17 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
@@ -34,23 +30,18 @@ echo "jo" >> $TMPFILE.cmd
 echo "jw -r $bitmaps" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans/script b/tests/j_short_trans/script
index ff2322c5df9267827f3078f865d869980b8bb6e7..ec28a594df72157c184beeab2f9676266e7216ba 100644 (file)
--- a/tests/j_short_trans/script
+++ b/tests/j_short_trans/script
@@ -12,38 +12,29 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_64bit/script b/tests/j_short_trans_64bit/script
index b7525fb750cae8ad53b28fa0f0dfd21dbdf5da92..7680473c0d28f28ed6cbd1ed7e3e3e2893274400 100644 (file)
--- a/tests/j_short_trans_64bit/script
+++ b/tests/j_short_trans_64bit/script
@@ -12,42 +12,33 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_mcsum_64bit/script b/tests/j_short_trans_mcsum_64bit/script
index a8f4e9370648a6027c53b6f212937bf36cc80391..511d4b704d6663c1731597d614ffbfa02a96bca7 100644 (file)
--- a/tests/j_short_trans_mcsum_64bit/script
+++ b/tests/j_short_trans_mcsum_64bit/script
@@ -12,42 +12,33 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE $TMPFILE.cmd
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_old_csum/script b/tests/j_short_trans_old_csum/script
index 46d0336e6ad2d6b3e3286a632e5f937887b83a5c..f58f21378d0267bb1e6566f1d3d3b1d61ed1de6a 100644 (file)
--- a/tests/j_short_trans_old_csum/script
+++ b/tests/j_short_trans_old_csum/script
@@ -12,42 +12,33 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_open_recover/script b/tests/j_short_trans_open_recover/script
index b0cc790dca14635bc0f7808d21fc52dee4a81dc3..d68504b899a00739db3475011a5375d74fabdd55 100644 (file)
--- a/tests/j_short_trans_open_recover/script
+++ b/tests/j_short_trans_open_recover/script
@@ -12,46 +12,35 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-echo "debugfs can't recover open journal" >> $OUT
+echo "debugfs can't recover open journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jr" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > $OUT.new 2>&1
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE $TMPFILE.cmd
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_recover/script b/tests/j_short_trans_recover/script
index ce82c87e2dcc7daceaad411287f205321be74949..37e9441b1e3d304164f082314c25c3e12bb76bc7 100644 (file)
--- a/tests/j_short_trans_recover/script
+++ b/tests/j_short_trans_recover/script
@@ -12,19 +12,15 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b 333,$bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
@@ -32,27 +28,20 @@ echo "jo" >> $TMPFILE.cmd
 echo "jw -r 333" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-echo "debugfs recover journal" >> $OUT
+echo "debugfs recover journal" >> $OUT.new
 echo "jr" > $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE $TMPFILE.cmd
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_recover_mcsum_64bit/script b/tests/j_short_trans_recover_mcsum_64bit/script
index 9671b8cd2bf2c414c594349ebb68983f9895dbd9..cb2635bdfef0d0b4bfa4572ed61ddc2f04cea96e 100644 (file)
--- a/tests/j_short_trans_recover_mcsum_64bit/script
+++ b/tests/j_short_trans_recover_mcsum_64bit/script
@@ -12,21 +12,17 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
 
 bitmaps="$($DUMPE2FS $TMPFILE 2>&1 | grep 'bitmap at' | sed -e 's/^.*bitmap at \([0-9]*\).*$/\1/g' | tr '\n' ',')"
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b 333,$bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
@@ -34,29 +30,22 @@ echo "jo" >> $TMPFILE.cmd
 echo "jw -r 333" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-echo "debugfs recover journal" >> $OUT
+echo "debugfs recover journal" >> $OUT.new
 echo "jr" > $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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
-rm -f $OUT.new
-
-rm -f $TMPFILE $TMPFILE.cmd
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_uncommitted_trans/script b/tests/j_short_uncommitted_trans/script
index 694d0c94ba5a0a2395f52c2932afee87c8dd1b24..b7a64b3b39da2439aec04f75d5f17d8650ad108e 100644 (file)
--- a/tests/j_short_uncommitted_trans/script
+++ b/tests/j_short_uncommitted_trans/script
@@ -12,38 +12,29 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps -c /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_uncommitted_trans_mcsum_64bit/script b/tests/j_short_uncommitted_trans_mcsum_64bit/script
index 87e4c2754ef8185e64de4e185a2a074ef8cd54fa..fe11af12514b16821176c549d6acb8213dbad9e6 100644 (file)
--- a/tests/j_short_uncommitted_trans_mcsum_64bit/script
+++ b/tests/j_short_uncommitted_trans_mcsum_64bit/script
@@ -12,42 +12,33 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O 64bit,has_journal,metadata_csum -T ext4 $TMPFILE 131072 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero -c" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-rm -rf $TMPFILE.cmd
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE
+sed -f $cmd_dir/filter.sed $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/m_devdir/script b/tests/m_devdir/script
index ef365b39a4dc7e7ab85985c40f6c68de3f3d30bf..dfc55c742c771e58ac807eb5ea548038e03cd0d0 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 < $OUT > $OUT.tmp
+sed -f $cmd_dir/filter.sed $OUT > $OUT.tmp
 mv $OUT.tmp $OUT
 
 if [ $mkfs_status -ne 0 ]; then
@@ -28,5 +28,5 @@ else
         echo "$test_name: $test_description: failed"
 fi
 
-rm -rf $TMPFILE.cmd $OUT.sed
+rm -f $TMPFILE.cmd
 unset MKFS_DIR OUT EXP

diff --git a/tests/m_error_behavior/script b/tests/m_error_behavior/script
index a5c553b8d9a49b683216c9ad657653c145072257..5f999f32312218fa268ccc8ffeb747bf907575bc 100755 (executable)
--- a/tests/m_error_behavior/script
+++ b/tests/m_error_behavior/script
@@ -24,11 +24,11 @@ write_section_conf()
 ENDL
 }
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "error default" >> $OUT

diff --git a/tests/m_hugefile/script b/tests/m_hugefile/script
index 846e4c6bf7acc00f8b71ba1d91b8902e0f833593..1abdb7de42a594ff8772696ce2b73320d0cfe0dd 100644 (file)
--- a/tests/m_hugefile/script
+++ b/tests/m_hugefile/script
@@ -37,7 +37,7 @@ ENDL
 
 echo "mke2fs -F -T hugefile test.img 4T" > $OUT
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T hugefile $TMPFILE 4T >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # check the file system if we get this far, we succeeded...
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1
@@ -102,7 +102,7 @@ rm $TMPFILE
 # Do the verification
 #
 
-sed -f $cmd_dir/filter.sed < $OUT > $OUT.new
+sed -f $cmd_dir/filter.sed $OUT > $OUT.new
 mv $OUT.new $OUT
 
 cmp -s $OUT $EXP

diff --git a/tests/m_hugefile_slack/script b/tests/m_hugefile_slack/script
index 3a0f0578128c762890ba38f332443ed782c8eefe..da7098aea60d63b60932b123b969251c1c2bff86 100644 (file)
--- a/tests/m_hugefile_slack/script
+++ b/tests/m_hugefile_slack/script
@@ -23,7 +23,7 @@ ENDL
 
 echo "mke2fs -F -T ext4h -I 128 test.img 786432" > $OUT
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -I 128 $TMPFILE 786432 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check. if we get this far, we succeeded...
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1

diff --git a/tests/m_mcsum_extjournal/script b/tests/m_mcsum_extjournal/script
index 624bf02e31767a30cab1adf2601bdaf5dd7499cb..bbf1f9bdbbe51480119ba84b8e5665a0c6d5dfcd 100644 (file)
--- a/tests/m_mcsum_extjournal/script
+++ b/tests/m_mcsum_extjournal/script
@@ -7,9 +7,7 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
-$MKE2FS -F -o Linux -b 1024 -O journal_dev,metadata_csum -T ext4 $TMPFILE 4096 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
+$MKE2FS -F -o Linux -b 1024 -O journal_dev,metadata_csum -T ext4 $TMPFILE 4096 2>&1 | sed -f $cmd_dir/filter.sed > $OUT
 $DUMPE2FS -h $TMPFILE 2>&1 | grep 'Filesystem features:' >> $OUT
 
 rm -f $TMPFILE

diff --git a/tests/m_minrootdir/script b/tests/m_minrootdir/script
index 365599384fa9694a7a2aabb0369b289db440686a..4e2314ce165d74e509723d10af904447971b7a72 100644 (file)
--- a/tests/m_minrootdir/script
+++ b/tests/m_minrootdir/script
@@ -36,7 +36,7 @@ stat /emptydir
 stat /dir
 stat /dir/file
 ENDL
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep "(stat|Size:|Type:)" | sed -f $test_dir/output.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep "(stat|Size:|Type:)" >> $OUT
 
 cat > $TMPFILE.cmd << ENDL
 ex /emptyfile
@@ -46,7 +46,7 @@ ex /bigzerofile
 ex /dir
 ex /dir/file
 ENDL
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $test_dir/output.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT 2>&1
 $FSCK -f -n $TMPFILE >> $OUT 2>&1
 
 echo "minify fs" >> $OUT
@@ -61,7 +61,7 @@ $RESIZE2FS -M $TMPFILE >> $OUT 2>&1
 $DUMPE2FS $TMPFILE >> $OUT 2>&1
 $FSCK -f -n $TMPFILE >> $OUT 2>&1
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" < $OUT > $OUT.tmp
+sed -f $cmd_dir/filter.sed -f $test_dir/output.sed -e "s;$TMPFILE;test.img;" < $OUT > $OUT.tmp
 mv $OUT.tmp $OUT
 
 # Do the verification
@@ -76,5 +76,5 @@ else
         diff $DIFF_OPTS $EXP $OUT > $test_name.failed
 fi
 
-rm -rf $TMPFILE.cmd $MKFS_DIR $OUT.sed
+rm -rf $TMPFILE.cmd $MKFS_DIR
 unset MKFS_DIR OUT EXP

diff --git a/tests/m_mkfs_overhead/script b/tests/m_mkfs_overhead/script
index c21da0c3e024202b8f8f59a80e0e871e25613ec2..ce8e4656fc6a559b2eaf79873f21b0e3f4f84d05 100644 (file)
--- a/tests/m_mkfs_overhead/script
+++ b/tests/m_mkfs_overhead/script
@@ -10,8 +10,6 @@ MKE2FS_SKIP_CHECK_MSG=true
 export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
 > $TMPFILE
 
-cp /dev/null $OUT
-
 $MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 |
        sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" > $OUT
 

diff --git a/tests/m_rootdir/script b/tests/m_rootdir/script
index 86a0b101a7015a7289fa3709b9dbfc4f20c943f2..2e54ae1095259c8d223c18478706e068b6cbddf5 100644 (file)
--- a/tests/m_rootdir/script
+++ b/tests/m_rootdir/script
@@ -37,7 +37,7 @@ stat /emptydir
 stat /dir
 stat /dir/file
 ENDL
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep "(stat|Size:|Type:)" | sed -f $test_dir/output.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep "(stat|Size:|Type:)" >> $OUT
 
 cat > $TMPFILE.cmd << ENDL
 ex /emptyfile
@@ -47,11 +47,11 @@ ex /bigzerofile
 ex /dir
 ex /dir/file
 ENDL
-$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $test_dir/output.sed >> $OUT 2>&1
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE >> $OUT 2>&1
 
 $FSCK -f -n $TMPFILE >> $OUT 2>&1
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" < $OUT > $OUT.tmp
+sed -f $cmd_dir/filter.sed -f $test_dir/output.sed -e "s;$TMPFILE;test.img;" < $OUT > $OUT.tmp
 mv $OUT.tmp $OUT
 
 # Do the verification
@@ -66,5 +66,5 @@ else
         diff $DIFF_OPTS $EXP $OUT > $test_name.failed
 fi
 
-rm -rf $TMPFILE.cmd $MKFS_DIR $OUT.sed
+rm -rf $TMPFILE.cmd $MKFS_DIR
 unset MKFS_DIR OUT EXP

diff --git a/tests/r_1024_small_bg/script b/tests/r_1024_small_bg/script
index 65276ab792db273fd3f7dd33069bed1ebe97f7d7..cdeb8e30e20b284e5466461a814624d8f51ceea7 100644 (file)
--- a/tests/r_1024_small_bg/script
+++ b/tests/r_1024_small_bg/script
@@ -19,7 +19,7 @@ if [ $RC -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 elif [ $RC -eq 111 ]; then
-       echo "$test_name: $test_description: skipped"
+       echo "$test_name: $test_description: skipped (no large sparse files)"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"

diff --git a/tests/r_32to64bit/script b/tests/r_32to64bit/script
index 6ecdf906824740d65c24648815b044af487fbdf0..47ca9ea6a62d60bfd07bd8fda89ae9ff72e9641d 100644 (file)
--- a/tests/r_32to64bit/script
+++ b/tests/r_32to64bit/script
@@ -27,7 +27,7 @@ ENDL
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 ($DUMPE2FS -h $TMPFILE; $DUMPE2FS -g $TMPFILE) 2> /dev/null | sed -f $cmd_dir/filter.sed > $OUT.before
@@ -37,7 +37,7 @@ echo Exit status is $status >> $OUT
 
 # resize it
 echo "resize2fs test.img -b" >> $OUT
-$RESIZE2FS -b -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -b -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 
@@ -55,7 +55,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/r_32to64bit_expand_full/script b/tests/r_32to64bit_expand_full/script
index ee888fe0fd71eb2e0ff8ec121103467d394393a9..018f42c0999f0ad63da788621595b99e63a1f5bd 100644 (file)
--- a/tests/r_32to64bit_expand_full/script
+++ b/tests/r_32to64bit_expand_full/script
@@ -29,7 +29,7 @@ ENDL
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 786432 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # check
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1
@@ -38,18 +38,18 @@ echo Exit status is $status >> $OUT
 
 # convert it
 echo "resize2fs -b test.img" >> $OUT
-$RESIZE2FS -b -f $TMPFILE 2>&1 >> $OUT 2>&1
-$DUMPE2FS -g $TMPFILE 2>&1 >> $OUT.before 2> /dev/null
+$RESIZE2FS -b -f $TMPFILE >> $OUT 2>&1
+$DUMPE2FS -g $TMPFILE >> $OUT.before 2> /dev/null
 
 # grow it
 echo "resize2fs test.img" >> $OUT
 dd if=/dev/zero of=$TMPFILE conv=notrunc bs=1 count=1 seek=1207959552 2> /dev/null
-$RESIZE2FS -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 
 # dump and check
-$DUMPE2FS -g $TMPFILE 2>&1 >> $OUT.after 2> /dev/null
+$DUMPE2FS -g $TMPFILE >> $OUT.after 2> /dev/null
 echo "Change in FS metadata:" >> $OUT
 diff -u $OUT.before $OUT.after | tail -n +3 >> $OUT
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1

diff --git a/tests/r_32to64bit_meta/script b/tests/r_32to64bit_meta/script
index 9711af0faf4b12e43a3182b2271f9758993808b4..5bf649fef235d44855ee1637b22036a8e3182c15 100644 (file)
--- a/tests/r_32to64bit_meta/script
+++ b/tests/r_32to64bit_meta/script
@@ -27,7 +27,7 @@ ENDL
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 ($DUMPE2FS -h $TMPFILE; $DUMPE2FS -g $TMPFILE) 2> /dev/null | sed -f $cmd_dir/filter.sed > $OUT.before
@@ -37,7 +37,7 @@ echo Exit status is $status >> $OUT
 
 # resize it
 echo "resize2fs test.img -b" >> $OUT
-$RESIZE2FS -b -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -b -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 

diff --git a/tests/r_32to64bit_move_itable/script b/tests/r_32to64bit_move_itable/script
index 6b339af23e9990e1e6b40c48a7880c54d6cafff2..c0b3e94116c46c04bb37964998c4e35c764283ad 100644 (file)
--- a/tests/r_32to64bit_move_itable/script
+++ b/tests/r_32to64bit_move_itable/script
@@ -27,7 +27,7 @@ ENDL
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 786432 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 ($DUMPE2FS -h $TMPFILE; $DUMPE2FS -g $TMPFILE) 2> /dev/null | sed -f $cmd_dir/filter.sed > $OUT.before
@@ -37,7 +37,7 @@ echo Exit status is $status >> $OUT
 
 # convert it
 echo "resize2fs test.img -b" >> $OUT
-$RESIZE2FS -b -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -b -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 

diff --git a/tests/r_64bit_big_expand/script b/tests/r_64bit_big_expand/script
index f514d501e99b16cea100df4293b54acf6e02f2df..3e5bdf251e1cca703a4d98fc7b400c57d3cea509 100644 (file)
--- a/tests/r_64bit_big_expand/script
+++ b/tests/r_64bit_big_expand/script
@@ -24,7 +24,7 @@ if [ $RC -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 elif [ $RC -eq 111 ]; then
-       echo "$test_name: $test_description: skipped"
+       echo "$test_name: $test_description: skipped (no large sparse files)"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"

diff --git a/tests/r_64to32bit/script b/tests/r_64to32bit/script
index 02718bdb9f079e4d861d9f9bffc9b00945b245b3..a9818355b439c4ffbc346d755a4367370c321a00 100644 (file)
--- a/tests/r_64to32bit/script
+++ b/tests/r_64to32bit/script
@@ -27,7 +27,7 @@ ENDL
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 ($DUMPE2FS -h $TMPFILE; $DUMPE2FS -g $TMPFILE) 2> /dev/null | sed -f $cmd_dir/filter.sed > $OUT.before
@@ -37,7 +37,7 @@ echo Exit status is $status >> $OUT
 
 # resize it
 echo "resize2fs test.img -s" >> $OUT
-$RESIZE2FS -s -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -s -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 
@@ -55,7 +55,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/r_64to32bit_meta/script b/tests/r_64to32bit_meta/script
index 69b33cc3a3b67f037c6fef9926009a907b14b932..9553e32c2680664e1fd831ad2243be660928ba62 100644 (file)
--- a/tests/r_64to32bit_meta/script
+++ b/tests/r_64to32bit_meta/script
@@ -27,7 +27,7 @@ ENDL
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 ($DUMPE2FS -h $TMPFILE; $DUMPE2FS -g $TMPFILE) 2> /dev/null | sed -f $cmd_dir/filter.sed > $OUT.before
@@ -37,7 +37,7 @@ echo Exit status is $status >> $OUT
 
 # resize it
 echo "resize2fs test.img -s" >> $OUT
-$RESIZE2FS -s -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -s -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 
@@ -55,7 +55,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/r_bigalloc_big_expand/script b/tests/r_bigalloc_big_expand/script
index 0c9986bb47bfed02d5e2ef3baafbfbbac002faf6..ac29e92089d73a0e33d0203714d90a8cfa51afcd 100644 (file)
--- a/tests/r_bigalloc_big_expand/script
+++ b/tests/r_bigalloc_big_expand/script
@@ -25,7 +25,7 @@ if [ $RC -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 elif [ $RC -eq 111 ]; then
-       echo "$test_name: $test_description: skipped"
+       echo "$test_name: $test_description: skipped (no large sparse files)"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"

diff --git a/tests/r_expand_full/script b/tests/r_expand_full/script
index 4a751f73ed06715b015c272b6839cc70210514d2..8b256529edb4b525bfc5afe9968fa1de62d65530 100644 (file)
--- a/tests/r_expand_full/script
+++ b/tests/r_expand_full/script
@@ -35,10 +35,10 @@ fi
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 786432 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
-$DUMPE2FS -g $TMPFILE 2>&1 >> $OUT.before 2> /dev/null
+$DUMPE2FS -g $TMPFILE >> $OUT.before 2> /dev/null
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
@@ -46,12 +46,12 @@ echo Exit status is $status >> $OUT
 # convert it
 echo "resize2fs test.img" >> $OUT
 $DD if=/dev/zero of=$TMPFILE conv=notrunc bs=1 count=1 seek=3221225471 2> /dev/null
-$RESIZE2FS -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 
 # dump and check
-$DUMPE2FS -g $TMPFILE 2>&1 >> $OUT.after 2> /dev/null
+$DUMPE2FS -g $TMPFILE >> $OUT.after 2> /dev/null
 echo "Change in FS metadata:" >> $OUT
 diff -u $OUT.before $OUT.after | tail -n +3 >> $OUT
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1

diff --git a/tests/r_ext4_big_expand/script b/tests/r_ext4_big_expand/script
index 266c9039cbfe72e0bc68f7e3d068d7c79ccdf1fb..c081d4473d02b88f4d9193dd2dfc67ddc901a659 100644 (file)
--- a/tests/r_ext4_big_expand/script
+++ b/tests/r_ext4_big_expand/script
@@ -24,7 +24,7 @@ if [ $RC -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 elif [ $RC -eq 111 ]; then
-       echo "$test_name: $test_description: skipped"
+       echo "$test_name: $test_description: skipped (no large sparse files)"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"

diff --git a/tests/r_ext4_small_bg/script b/tests/r_ext4_small_bg/script
index 87f5084daf7880676bbd931d0a538cb69736ada5..ac7556c4f2843b6122659de037a77ca28d142d47 100644 (file)
--- a/tests/r_ext4_small_bg/script
+++ b/tests/r_ext4_small_bg/script
@@ -19,7 +19,7 @@ if [ $RC -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 elif [ $RC -eq 111 ]; then
-       echo "$test_name: $test_description: skipped"
+       echo "$test_name: $test_description: skipped (no large sparse files)"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"

diff --git a/tests/r_fixup_lastbg/script b/tests/r_fixup_lastbg/script
index 04514210d392506669e1b3b44c5100e824519808..9fc0ec5a84c5fd2f76ad8913805574779ef1dad9 100755 (executable)
--- a/tests/r_fixup_lastbg/script
+++ b/tests/r_fixup_lastbg/script
@@ -5,8 +5,7 @@ if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
 fi
 
 EXP=$test_dir/expect
-OUT=$test_name.out
-LOG=$test_name.log
+OUT=$test_name.log
 E2FSCK=../e2fsck/e2fsck
 
 $MKE2FS -T ext4 -b 1024 -F -U 56d3ee50-8532-4f29-8181-d7c6ea4a94a6 $TMPFILE 20000 > $OUT 2>&1
@@ -20,17 +19,17 @@ $RESIZE2FS_EXE -f -p $TMPFILE 20004 >> $OUT 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | grep -A10 '^Group 2:' >> $OUT
 $E2FSCK -fy $TMPFILE >> $OUT 2>&1
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" < $OUT > $LOG
-rm -rf $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" < $OUT > $OUT.new
+mv $OUT.new $OUT
 
-cmp -s $LOG $EXP
-RC=$?
-if [ $RC -eq 0 ]; then
+cmp -s $OUT $EXP
+status=$?
+if [ $status -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"
-       diff -u $EXP $LOG > $test_name.failed
+       diff -u $EXP $OUT > $test_name.failed
 fi
 
-unset EXP LOG OUT E2FSCK
+unset EXP OUT E2FSCK

diff --git a/tests/r_fixup_lastbg_big/script b/tests/r_fixup_lastbg_big/script
index a12fb1674685ee1adc6694965d6daf49985db953..113831b7ab24dfda4b576378e8d582fefdb08bb1 100755 (executable)
--- a/tests/r_fixup_lastbg_big/script
+++ b/tests/r_fixup_lastbg_big/script
@@ -5,8 +5,7 @@ if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
 fi
 
 EXP=$test_dir/expect
-OUT=$test_name.out
-LOG=$test_name.log
+OUT=$test_name.log
 E2FSCK=../e2fsck/e2fsck
 
 $MKE2FS -T ext4 -b 1024 -F -U 56d3ee50-8532-4f29-8181-d7c6ea4a94a6 $TMPFILE 20000 > $OUT 2>&1
@@ -20,17 +19,17 @@ RESIZE2FS_FORCE_ITABLE_INIT=1 $RESIZE2FS_EXE -f -p $TMPFILE >> $OUT 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | grep -A10 '^Group 2:' >> $OUT
 $E2FSCK -fy $TMPFILE >> $OUT 2>&1
 
-sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" < $OUT > $LOG
-rm -rf $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" < $OUT > $OUT.new
+mv $OUT.new $OUT
 
-cmp -s $LOG $EXP
-RC=$?
-if [ $RC -eq 0 ]; then
+cmp -s $OUT $EXP
+status=$?
+if [ $status -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"
-       diff -u $EXP $LOG > $test_name.failed
+       diff -u $EXP $OUT > $test_name.failed
 fi
 
-unset EXP LOG OUT E2FSCK
+unset EXP OUT E2FSCK

diff --git a/tests/r_inline_xattr/script b/tests/r_inline_xattr/script
index 7f0fb23dfb7a71778059e8925d7b0b089df6ef13..4e7dd94cf132280df824303b8f6c8bc2d5c4fcb0 100644 (file)
--- a/tests/r_inline_xattr/script
+++ b/tests/r_inline_xattr/script
@@ -10,27 +10,27 @@ EXP=$test_dir/expect
 
 gunzip < $IMAGE > $TMPFILE
 
-echo "resize2fs test" > $OUT
+echo "resize2fs test" > $OUT.new
 
 # Look at existing inline extended attribute
-echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT
-$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT
+echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT.new
+$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT.new
 status=$?
-echo Exit status is $status >> $OUT
+echo Exit status is $status >> $OUT.new
 
 # resize it
-echo "resize2fs test.img 5M" >> $OUT
-$RESIZE2FS $TMPFILE 5M 2>&1 >> $OUT.new 2>&1
+echo "resize2fs test.img 5M" >> $OUT.new
+$RESIZE2FS $TMPFILE 5M >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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
-$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT
+echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT.new
+$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT.new
 status=$?
-echo Exit status is $status >> $OUT
+echo Exit status is $status >> $OUT.new
 
+sed -f $cmd_dir/filter.sed < $OUT.new > $OUT
 rm $TMPFILE $OUT.new
 
 #

diff --git a/tests/r_meta_bg_shrink/script b/tests/r_meta_bg_shrink/script
index c47d4ff885401230751d34cc23950584867bcdfb..c39b86028fb94103b8d0dedc1191beec77fdab06 100644 (file)
--- a/tests/r_meta_bg_shrink/script
+++ b/tests/r_meta_bg_shrink/script
@@ -22,7 +22,7 @@ if [ $RC -eq 0 ]; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
 elif [ $RC -eq 111 ]; then
-       echo "$test_name: $test_description: skipped"
+       echo "$test_name: $test_description: skipped (no large sparse files)"
        touch $test_name.ok
 else
        echo "$test_name: $test_description: failed"

diff --git a/tests/r_min_itable/script b/tests/r_min_itable/script
index b889adc613852415056a4337720745261e83076c..16d3f649d9396594e4f414d3823e3677f9686ed5 100644 (file)
--- a/tests/r_min_itable/script
+++ b/tests/r_min_itable/script
@@ -10,10 +10,10 @@ EXP=$test_dir/expect
 
 gunzip < $IMAGE > $TMPFILE
 
-echo "resize2fs test" > $OUT
+echo "resize2fs test" > $OUT.new
 
-echo "resize2fs -M test.img" >> $OUT
-$RESIZE2FS -M $TMPFILE 2>&1 >> $OUT.new 2>&1
+echo "resize2fs -M test.img" >> $OUT.new
+$RESIZE2FS -M $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
 
@@ -21,8 +21,7 @@ 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
 echo Exit status is $status >> $OUT.new
-
-sed -f $cmd_dir/filter.sed $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 c017efc5e69aa791152cb0084b4cf15bdc474fbf..14d918a95a995242b4a842e2248003e3dc5fc813 100644 (file)
--- a/tests/r_move_itable/script
+++ b/tests/r_move_itable/script
@@ -12,92 +12,78 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 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 >> $OUT
+echo mke2fs -q -F -o Linux -b 1024 -g 256 test.img 1024 > $OUT.new
+$MKE2FS -q -F -o Linux -b 1024 -g 256 $TMPFILE 1024 >> $OUT.new 2>&1
 
-echo resize2fs -p test.img 10000 >> $OUT
-$RESIZE2FS -p $TMPFILE 10000 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+echo resize2fs -p test.img 10000 >> $OUT.new
+$RESIZE2FS -p $TMPFILE 10000 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
-echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
+echo dumpe2fs test.img >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
 
-echo "--------------------------------" >> $OUT
+echo "--------------------------------" >> $OUT.new
 
-echo resize2fs -p test.img 20000 >> $OUT
-$RESIZE2FS -p $TMPFILE 20000 2>&1 |
-       sed -f $cmd_dir/filter.sed >> $OUT
+echo resize2fs -p test.img 20000 >> $OUT.new
+$RESIZE2FS -p $TMPFILE 20000 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
-echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
+echo dumpe2fs test.img >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
 
-echo "--------------------------------" >> $OUT
+echo "--------------------------------" >> $OUT.new
 
-echo resize2fs -p test.img 30000 >> $OUT
-$RESIZE2FS -p $TMPFILE 30000 2>&1 |
-       sed -f $cmd_dir/filter.sed >> $OUT
+echo resize2fs -p test.img 30000 >> $OUT.new
+$RESIZE2FS -p $TMPFILE 30000 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
-echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
+echo dumpe2fs test.img >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
 
-echo "--------------------------------" >> $OUT
+echo "--------------------------------" >> $OUT.new
 
-echo resize2fs -p test.img 40000 >> $OUT
-$RESIZE2FS -p $TMPFILE 40000 2>&1 |
-       sed -f $cmd_dir/filter.sed >> $OUT
+echo resize2fs -p test.img 40000 >> $OUT.new
+$RESIZE2FS -p $TMPFILE 40000 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
-echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
-
-rm -f $TMPFILE
+echo dumpe2fs test.img >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' < $OUT.new > $OUT
+rm -f $TMPFILE $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/r_move_itable_nostride/script b/tests/r_move_itable_nostride/script
index ec4665ee730bc712b8e00032f5fc8867bea06588..08940f61db32b8335e0fd84fdc6361596ba8f5dd 100644 (file)
--- a/tests/r_move_itable_nostride/script
+++ b/tests/r_move_itable_nostride/script
@@ -24,24 +24,18 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 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 >> $OUT
+       $TMPFILE 1024000 >> $OUT 2>&1
 
 echo resize2fs -p test.img 10240000 >> $OUT
-$RESIZE2FS -p $TMPFILE 100000000 2>&1 |
-       sed -f $cmd_dir/filter.sed >> $OUT
+$RESIZE2FS -p $TMPFILE 100000000 >> $OUT 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK $FSCK_OPT  -N test_filesys $TMPFILE >> $OUT 2>&1
 status=$?
-echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
+echo Exit status is $status >> $OUT
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
@@ -49,8 +43,9 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
 echo dumpe2fs -h test.img >> $OUT
-$DUMPE2FS -h $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
-
+$DUMPE2FS -h $TMPFILE >> $OUT 2>&1
+sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' < $OUT > $OUT.new
+mv $OUT.new $OUT
 rm -f $TMPFILE
 
 cmp -s $OUT $EXP

diff --git a/tests/r_move_itable_realloc/script b/tests/r_move_itable_realloc/script
index 7d4b5bac0627d176344425fea04a8538d1be737a..edc1303a1d9f9cf069063879f1448d7d9fbe13e8 100644 (file)
--- a/tests/r_move_itable_realloc/script
+++ b/tests/r_move_itable_realloc/script
@@ -24,24 +24,18 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 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 >> $OUT
+       $TMPFILE 1024000 >> $OUT 2>&1
 
 echo resize2fs -p test.img 10240000 >> $OUT
-$RESIZE2FS -p $TMPFILE 100000000 2>&1 |
-       sed -f $cmd_dir/filter.sed >> $OUT
+$RESIZE2FS -p $TMPFILE 100000000 >> $OUT 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK $FSCK_OPT  -N test_filesys $TMPFILE >> $OUT 2>&1
 status=$?
-echo Exit status is $status >> $OUT.new
-sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-rm -f $OUT.new
+echo Exit status is $status >> $OUT
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
@@ -49,8 +43,9 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
 echo dumpe2fs -h test.img >> $OUT
-$DUMPE2FS -h $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
-
+$DUMPE2FS -h $TMPFILE >> $OUT 2>&1
+sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' < $OUT > $OUT.new
+mv $OUT.new $OUT
 rm -f $TMPFILE
 
 cmp -s $OUT $EXP

diff --git a/tests/r_resize_inode/script b/tests/r_resize_inode/script
index 8b586d3317bdee30f7307bca7c9fd39ea104b3f5..f6a500c3970e1e364e9b99fab86776b4fdb0fd02 100644 (file)
--- a/tests/r_resize_inode/script
+++ b/tests/r_resize_inode/script
@@ -9,76 +9,67 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
 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 >> $OUT
+echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT.new
+$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 >> $OUT.new 2>&1
 
-echo resize2fs test.img 65536 >> $OUT
-$RESIZE2FS $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+echo resize2fs test.img 65536 >> $OUT.new
+$RESIZE2FS $TMPFILE 65536 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
-echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
+echo dumpe2fs test.img >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
 
-echo "--------------------------------" >> $OUT
+echo "--------------------------------" >> $OUT.new
 
 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 >> $OUT
+echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 >> $OUT.new
+$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 >> $OUT.new 2>&1
 
-echo resize2fs test.img 16384 >> $OUT
-$RESIZE2FS $TMPFILE 16384 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+echo resize2fs test.img 16384 >> $OUT.new
+$RESIZE2FS $TMPFILE 16384 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
-echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
+echo dumpe2fs test.img >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
 
-echo "--------------------------------" >> $OUT
+echo "--------------------------------" >> $OUT.new
 
-echo resize2fs test.img 165536 >> $OUT
-$RESIZE2FS $TMPFILE 165536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+echo resize2fs test.img 165536 >> $OUT.new
+$RESIZE2FS $TMPFILE 165536 >> $OUT.new 2>&1
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT.new 2>&1
+$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 $OUT.new >> $OUT
-rm -f $OUT.new
 
 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
 $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
-echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' >> $OUT
+echo dumpe2fs test.img >> $OUT.new
+$DUMPE2FS $TMPFILE >> $OUT.new 2>&1
+sed -f $cmd_dir/filter.sed -e '/Block bitmap.*$/N;s/\n  Inode bitmap/, Inode bitmap/g' < $OUT.new > $OUT
+rm -f $TMPFILE $OUT.new
 
-rm -f $TMPFILE
 cmp -s $OUT $EXP
 status=$?
 

diff --git a/tests/run_e2fsck b/tests/run_e2fsck
index f96517940da323d28464c661f5ca8d7d59be7334..e2c6596837b3cd4d36b807e010b100d0bb415c4e 100644 (file)
--- a/tests/run_e2fsck
+++ b/tests/run_e2fsck
@@ -47,7 +47,7 @@ cp /dev/null $OUT1
 
 eval $PREP_CMD
 
-$FSCK $FSCK_OPT  -N test_filesys $TMPFILE > $OUT1.new 2>&1
+$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 $OUT1.new >> $OUT1

diff --git a/tests/t_change_uuid/script b/tests/t_change_uuid/script
index be8cbfa5cfc52bac51f7b89e1114a15a90c39258..d568f46595778b6d33f3364d4b174d74edcfb3a3 100755 (executable)
--- a/tests/t_change_uuid/script
+++ b/tests/t_change_uuid/script
@@ -1,10 +1,10 @@
 test_description="change uuid on a pre-metadata-csum"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs without metadata_csum" >> $OUT

diff --git a/tests/t_change_uuid_mcsum/script b/tests/t_change_uuid_mcsum/script
index 826d287e58d28c34b039e5a763e655907b6ff2b8..36585946e440cff60fd5c3f2a39084fdfe406b16 100755 (executable)
--- a/tests/t_change_uuid_mcsum/script
+++ b/tests/t_change_uuid_mcsum/script
@@ -1,10 +1,10 @@
 test_description="change uuid on a metadata-csum"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs with metadata_csum" >> $OUT

diff --git a/tests/t_change_uuid_mcsum_mounted/script b/tests/t_change_uuid_mcsum_mounted/script
index 0efcae54b00d4b7f081ffbcfa47dc082d6a15bd6..5a534a0db3e8dab1cb5ce6af291f34c9846ddfdb 100755 (executable)
--- a/tests/t_change_uuid_mcsum_mounted/script
+++ b/tests/t_change_uuid_mcsum_mounted/script
@@ -1,10 +1,10 @@
 test_description="change uuid on a metadata-csum"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs with metadata_csum" >> $OUT

diff --git a/tests/t_change_uuid_mcsum_seed_mounted/script b/tests/t_change_uuid_mcsum_seed_mounted/script
index 2b437fb2c9bdd10f90dbc4c48d74f31a5ca4c5e4..c827325d17b92a2c281d9763e8a9a23b07602edc 100755 (executable)
--- a/tests/t_change_uuid_mcsum_seed_mounted/script
+++ b/tests/t_change_uuid_mcsum_seed_mounted/script
@@ -1,10 +1,10 @@
 test_description="change meta-csum uuid with mcsum-seed"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs with metadata_csum" >> $OUT

diff --git a/tests/t_change_uuid_mounted/script b/tests/t_change_uuid_mounted/script
index 827ff59d4f238f5041a307573183120ec7b87b54..150f4510b881b3639c14c4f0091d607d6e39fa35 100755 (executable)
--- a/tests/t_change_uuid_mounted/script
+++ b/tests/t_change_uuid_mounted/script
@@ -1,10 +1,10 @@
 test_description="change uuid on a mounted pre-metadata-csum"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs without metadata_csum" >> $OUT

diff --git a/tests/t_disable_changed_csum_seed/script b/tests/t_disable_changed_csum_seed/script
index bd48925560d2ab851eb81df4f4a681e6b5a9c4f3..f7211441a6f738bcf0fa6ab27ace4e03025f9521 100755 (executable)
--- a/tests/t_disable_changed_csum_seed/script
+++ b/tests/t_disable_changed_csum_seed/script
@@ -1,10 +1,10 @@
 test_description="tune2fs disable csum seed after uuid change"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT

diff --git a/tests/t_disable_changed_csum_seed_mounted/script b/tests/t_disable_changed_csum_seed_mounted/script
index 203253cf4a85bb1778cc15e6f95d0b0f1ab4f18a..229d6eeaaa165f790817fb4baa40b20b2420623e 100755 (executable)
--- a/tests/t_disable_changed_csum_seed_mounted/script
+++ b/tests/t_disable_changed_csum_seed_mounted/script
@@ -1,10 +1,10 @@
 test_description="mounted tune2fs disable csum+uuid"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT

diff --git a/tests/t_disable_csum_seed/script b/tests/t_disable_csum_seed/script
index 28fdc5c0dca05e322204dc7e7c9bbb676b2ec433..cb1cbc67e4b6e0046ba7fffe0b98cfd2d01d2367 100755 (executable)
--- a/tests/t_disable_csum_seed/script
+++ b/tests/t_disable_csum_seed/script
@@ -1,10 +1,10 @@
 test_description="disable csum seed via tune2fs"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT

diff --git a/tests/t_disable_mcsum_noinitbg/script b/tests/t_disable_mcsum_noinitbg/script
index db49864ad59d1174f091931c3221f1f727adbb4d..70f40a945e1f44ccc524e12ba5be345d368d2ad6 100644 (file)
--- a/tests/t_disable_mcsum_noinitbg/script
+++ b/tests/t_disable_mcsum_noinitbg/script
@@ -22,7 +22,7 @@ ENDL
 echo "tune2fs ^metadata_csum test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 $DUMPE2FS $TMPFILE 2> /dev/null | grep '^Group 0:' -B99 -A20 | sed -f $cmd_dir/filter.sed > $OUT.before

diff --git a/tests/t_disable_mcsum_yesinitbg/script b/tests/t_disable_mcsum_yesinitbg/script
index 2d040410f6d982fcbeb30e72124874b96e116b3f..1f260b8e1594287b2ea6f831102568e0c3225641 100644 (file)
--- a/tests/t_disable_mcsum_yesinitbg/script
+++ b/tests/t_disable_mcsum_yesinitbg/script
@@ -22,7 +22,7 @@ ENDL
 echo "tune2fs ^metadata_csum test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 $DUMPE2FS $TMPFILE 2> /dev/null | grep '^Group 0:' -B99 -A20 | sed -f $cmd_dir/filter.sed > $OUT.before

diff --git a/tests/t_disable_meta_csum_and_seed/script b/tests/t_disable_meta_csum_and_seed/script
index 9eb18e30330ae518ef14e9c299a914e9494598b9..20e52ac84be99ced477c7314fde604a0ed955468 100755 (executable)
--- a/tests/t_disable_meta_csum_and_seed/script
+++ b/tests/t_disable_meta_csum_and_seed/script
@@ -1,10 +1,10 @@
 test_description="disable csum seed and csums via tune2fs"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT

diff --git a/tests/t_enable_csum_seed/script b/tests/t_enable_csum_seed/script
index 55cade6484a6ede8a7e776cabff9fd2ab3f12c8a..5eff077a5a1dc86e1faafc62dd244951759d2096 100755 (executable)
--- a/tests/t_enable_csum_seed/script
+++ b/tests/t_enable_csum_seed/script
@@ -1,10 +1,10 @@
 test_description="enable csum seed via tune2fs"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT

diff --git a/tests/t_ext_jnl_fail/script b/tests/t_ext_jnl_fail/script
index bb31cc79a58ee9580d3504339efac518936a8300..2831416be6547cfacf8c6f1c973f3fb2c98ae1dc 100644 (file)
--- a/tests/t_ext_jnl_fail/script
+++ b/tests/t_ext_jnl_fail/script
@@ -7,14 +7,14 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
-
-$MKE2FS -F -o Linux -b 1024 -O journal_dev,metadata_csum -T ext4 $TMPFILE 4096 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
+$MKE2FS -F -o Linux -b 1024 -O journal_dev,metadata_csum -T ext4 $TMPFILE 4096 > $OUT 2>&1
 echo "tune2fs external journal" >> $OUT
-$TUNE2FS -i 0 $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-
+$TUNE2FS -i 0 $TMPFILE >> $OUT 2>&1
 rm -f $TMPFILE
 
+sed -f $cmd_dir/filter.sed < $OUT > $OUT.new
+mv $OUT.new $OUT
+
 cmp -s $OUT $EXP
 status=$?
 

diff --git a/tests/t_format_csum_seed/script b/tests/t_format_csum_seed/script
index 1829514c789a96dfbc8f95d62024ca30bd7bbb08..882e8eb774c9a916015bb21ff0ce9c34f8e3f147 100755 (executable)
--- a/tests/t_format_csum_seed/script
+++ b/tests/t_format_csum_seed/script
@@ -1,10 +1,10 @@
 test_description="format with csum_seed"
 
-trap "rm -rf $TMPFILE $TMPFILE.conf" EXIT INT QUIT
+trap "rm -f $TMPFILE $TMPFILE.conf" EXIT INT QUIT
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 OUT=$test_name.log
 EXP=$test_dir/expect
-rm -rf $OUT
+rm -f $OUT
 
 # Test command line option
 echo "create fs with csum_seed" >> $OUT

diff --git a/tests/t_iexpand_full/script b/tests/t_iexpand_full/script
index 63302c81ebd3fecef0c46072dc68d989420edd9d..bd0b7004006a8e4a0bd3cf17a44bfefc9356aa80 100644 (file)
--- a/tests/t_iexpand_full/script
+++ b/tests/t_iexpand_full/script
@@ -35,7 +35,7 @@ ENDL
 echo "tune2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -I 128 $TMPFILE 786432 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
 ($DUMPE2FS -h $TMPFILE; $DUMPE2FS -g $TMPFILE) 2>&1 | sed -f $cmd_dir/filter.sed -e '/^Checksum:.*/d' >> $OUT.before 2> /dev/null

diff --git a/tests/t_iexpand_mcsum/script b/tests/t_iexpand_mcsum/script
index d9cd28f7c9cfeb7fc1ca34d3034917b6b67a309f..32c8d0e440afe6766ced29d6e5f67634cbf66568 100644 (file)
--- a/tests/t_iexpand_mcsum/script
+++ b/tests/t_iexpand_mcsum/script
@@ -35,10 +35,10 @@ ENDL
 echo "tune2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -I 128 $TMPFILE 786432 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
-($DUMPE2FS -h $TMPFILE | grep -v '^Free blocks:'; $DUMPE2FS -g $TMPFILE) 2>&1 | sed -f $cmd_dir/filter.sed -e '/^Checksum:.*/d' >> $OUT.before 2> /dev/null
+($DUMPE2FS -h $TMPFILE | grep -v '^Free blocks:'; $DUMPE2FS -g $TMPFILE) 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT.before 2> /dev/null
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
@@ -52,7 +52,7 @@ echo Exit status is $status >> $OUT
 $FSCK -N test_filesys -y -f -D $TMPFILE >> $OUT 2>&1
 
 # dump and check
-($DUMPE2FS -h $TMPFILE | grep -v '^Free blocks:'; $DUMPE2FS -g $TMPFILE) 2>&1 | sed -f $cmd_dir/filter.sed -e '/^Checksum:.*/d' >> $OUT.after 2> /dev/null
+($DUMPE2FS -h $TMPFILE | grep -v '^Free blocks:'; $DUMPE2FS -g $TMPFILE) 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT.after 2> /dev/null
 echo "Change in FS metadata:" >> $OUT
 diff -U 0 $OUT.before $OUT.after | sed -e '/^---.*/d' -e '/^+++.*/d' >> $OUT
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1

diff --git a/tests/t_replay_and_set/script b/tests/t_replay_and_set/script
index 2663af26cb6551c01cab0f9db8b5f82cf374734a..3b033a82fbc059ceb146871f0aaf162e7275f673 100644 (file)
--- a/tests/t_replay_and_set/script
+++ b/tests/t_replay_and_set/script
@@ -12,37 +12,29 @@ else
        EXP=$test_dir/expect
 fi
 
-cp /dev/null $OUT
+$MKE2FS -F -o Linux -b 4096 -O has_journal,metadata_csum -T ext4 $TMPFILE 65536 > $OUT.new 2>&1
 
-$MKE2FS -F -o Linux -b 4096 -O has_journal,metadata_csum -T ext4 $TMPFILE 65536 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
-
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+$FSCK -fy -N test_filesys $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
-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' ',')"
 
-echo "debugfs write journal" >> $OUT
+echo "debugfs write journal" >> $OUT.new
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
 $DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
-sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
-rm -rf $OUT.new
 
-echo "set the label on a dirty-journal fs" >> $OUT
-$TUNE2FS -L testing $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT 2>&1
+echo "set the label on a dirty-journal fs" >> $OUT.new
+$TUNE2FS -L testing $TMPFILE >> $OUT.new 2>&1
 
-echo "fsck the whole mess" >> $OUT
-$FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
+echo "fsck the whole mess" >> $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 $OUT.new >> $OUT
-rm -f $OUT.new
-
-rm -f $TMPFILE $TMPFILE.cmd
+sed -f $cmd_dir/filter.sed < $OUT.new > $OUT
+rm -f $TMPFILE $TMPFILE.cmd $OUT.new
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/t_uninit_bg_rm/script b/tests/t_uninit_bg_rm/script
index 3757a5ae567304b0293d617ff1b12e3c1c03095d..7b95710dfb9b2677516faf8c42b3fb42ebe25f2e 100644 (file)
--- a/tests/t_uninit_bg_rm/script
+++ b/tests/t_uninit_bg_rm/script
@@ -10,9 +10,8 @@ if [ $(uname -s) = "Darwin" ]; then
 fi
 
 cp /dev/null $TMPFILE
-rm -f $OUT.new
 
-echo mke2fs -q -t ext4 -F -o Linux -b 1024 test.img 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 test.img" >> $OUT.new
@@ -33,10 +32,9 @@ $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 < $OUT.new > $OUT
 
-sed -f $cmd_dir/filter.sed $OUT.new > $OUT
-
-rm -f $OUT.new $TMPFILE
+rm -f $TMPFILE $OUT.new
 
 #
 # Do the verification