tests: fix missing cleanup of temporary files

A number of tests weren't properly cleaning their temp files.

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

diff --git a/tests/f_uninit_cat/script b/tests/f_uninit_cat/script
index 1655bb0711ad716b841fb3078439a0f03d7abb89..8877566022e879e42d977d7dae5d7b9872653566 100755 (executable)
--- a/tests/f_uninit_cat/script
+++ b/tests/f_uninit_cat/script
@@ -21,7 +21,7 @@ echo "cat /a" >> $TMPFILE.cmd
 $DEBUGFS_EXE -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
+rm -rf $OUT.new $TMPFILE $TMPFILE.cmd
 
 # Figure out what happened
 if cmp -s $EXP $OUT; then

diff --git a/tests/j_short_trans_mcsum_64bit/script b/tests/j_short_trans_mcsum_64bit/script
index 024346aa9a1b59bc36f7df31f1a169fb54a619e9..034b23701988c1d442ba5094df57761335094447 100644 (file)
--- a/tests/j_short_trans_mcsum_64bit/script
+++ b/tests/j_short_trans_mcsum_64bit/script
@@ -44,7 +44,7 @@ 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
+rm -f $TMPFILE $TMPFILE.cmd
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_open_recover/script b/tests/j_short_trans_open_recover/script
index 2a016dfae485e6c7059e4451cd7fb64222d0dabf..67136fe61eddc333137d49c4399e37161be4df66 100644 (file)
--- a/tests/j_short_trans_open_recover/script
+++ b/tests/j_short_trans_open_recover/script
@@ -48,7 +48,7 @@ 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
+rm -f $TMPFILE $TMPFILE.cmd
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/j_short_trans_recover/script b/tests/j_short_trans_recover/script
index 33d2345592563328e7abe13029abcf9806d2de30..e7b49437fa68d275d92e9d3866974b5739ae0290 100644 (file)
--- a/tests/j_short_trans_recover/script
+++ b/tests/j_short_trans_recover/script
@@ -49,7 +49,7 @@ 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
+rm -f $TMPFILE $TMPFILE.cmd
 
 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 b6c8c49fedbdb21daecc7b51365d4f90024712c5..2c56e0ff17598987a2a12f2c1736b1a110c7cfa5 100644 (file)
--- a/tests/j_short_trans_recover_mcsum_64bit/script
+++ b/tests/j_short_trans_recover_mcsum_64bit/script
@@ -53,7 +53,7 @@ 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
+rm -f $TMPFILE $TMPFILE.cmd
 
 cmp -s $OUT $EXP
 status=$?

diff --git a/tests/scripts/resize_test b/tests/scripts/resize_test
index dfd45ac8ef6ddf49aaa8a3e7514fc23ddb8666df..3c5e260bf8bcacf0144ce3364ba7ce4cbbc2c46d 100755 (executable)
--- a/tests/scripts/resize_test
+++ b/tests/scripts/resize_test
@@ -161,12 +161,13 @@ echo Checksum is $CSUM_2 >> $LOG
 rm $OUT_TMP
 unset OUT_TMP
 
+rm -f $TMPFILE
+
 if test "$CSUM_1" != "$CSUM_2"
 then
        return 1
 fi
 
-rm $TMPFILE
 return 0
 
 }

diff --git a/tests/t_replay_and_set/script b/tests/t_replay_and_set/script
index 125309992acded4f6156edf2aecb829939f0cc95..0be10ea8083f49d837b8881eaeace50e875544ef 100644 (file)
--- a/tests/t_replay_and_set/script
+++ b/tests/t_replay_and_set/script
@@ -39,7 +39,7 @@ 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
+rm -f $TMPFILE $TMPFILE.cmd
 
 cmp -s $OUT $EXP
 status=$?