tests: remove unused temporary files for MMP tests

The MMP tests need to be run on a real disk instead of tmpfs, since
the MMP block access is using O_DIRECT.  As such, they create their
own test files in the local testing directory instead of using the
temporary file created in /tmp by the test_one script.  Delete the
tempfs file before clobbering TMPFILE, otherwise it will leave the
unused file in /tmp after the test is completed.

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

diff --git a/tests/f_mmp/script b/tests/f_mmp/script
index 1b0ff793fbbd86bfb40169bbe0fdece00465e8c7..05421c4e57c316016263b6dd6617dcd1ec0779bf 100644 (file)
--- a/tests/f_mmp/script
+++ b/tests/f_mmp/script
@@ -1,5 +1,6 @@
 FSCK_OPT=-yf
 
+[ -f "$TMPFILE" ] && rm -f $TMPFILE
 TMPFILE=$test_name.tmp
 > $TMPFILE
 

diff --git a/tests/f_mmp_garbage/script b/tests/f_mmp_garbage/script
index 02cc12a4280b4ad8002d527c35eeae2309e9e5e0..d4d2cb3c441abcd3344528dae66f07d14bb8438d 100644 (file)
--- a/tests/f_mmp_garbage/script
+++ b/tests/f_mmp_garbage/script
@@ -1,5 +1,6 @@
 FSCK_OPT=-yf
 
+[ -f "$TMPFILE" ] && rm -f $TMPFILE
 TMPFILE=$test_name.tmp
 > $TMPFILE
 

diff --git a/tests/m_mmp/script b/tests/m_mmp/script
index 02b0b4b84c08d59313514034a4b4063cf646f020..dff98f05c030efb701a65e091e722dfb789d2e0d 100644 (file)
--- a/tests/m_mmp/script
+++ b/tests/m_mmp/script
@@ -2,6 +2,7 @@ DESCRIPTION="enable MMP during mke2fs"
 FS_SIZE=65536
 MKE2FS_DEVICE_SECTSIZE=2048
 export MKE2FS_DEVICE_SECTSIZE
+[ -f "$TMPFILE" ] && rm -f $TMPFILE
 TMPFILE=$test_name.tmp
 > $TMPFILE
 stat -f $TMPFILE | grep -q "Type: tmpfs"

diff --git a/tests/t_mmp_1on/script b/tests/t_mmp_1on/script
index 8fc8158ff60d23e1d480eb42b8a9fe91701d0d29..d15b1e33bb8d13cd201db2b51400ece45da39dc9 100644 (file)
--- a/tests/t_mmp_1on/script
+++ b/tests/t_mmp_1on/script
@@ -1,5 +1,6 @@
 FSCK_OPT=-yf
 
+[ -f "$TMPFILE" ] && rm -f $TMPFILE
 TMPFILE=$test_name.tmp
 > $TMPFILE
 

diff --git a/tests/t_mmp_2off/script b/tests/t_mmp_2off/script
index 1dee14ed53ccb9d3baa90541534420e593300055..572730b4eca7921ead4839adfc359b891c8a45f3 100644 (file)
--- a/tests/t_mmp_2off/script
+++ b/tests/t_mmp_2off/script
@@ -1,5 +1,6 @@
 FSCK_OPT=-yf
 
+[ -f "$TMPFILE" ] && rm -f $TMPFILE
 TMPFILE=$test_name.tmp
 > $TMPFILE