[v3] fstests: remove tmp files properly

Commit Message

Eryu Guan Jan. 19, 2017, 7:53 a.m. UTC

Some tests and common helpers don't properly clean up tmp files and
leave them behind in /tmp dir, and these tmp files are accumulating
over time.

Signed-off-by: Eryu Guan <[e-mail]>
---
v3:
- replace dangerous "rm -f $tmp*" with "rm -f $tmp.*", just in
  case $tmp is empty

v2:
- let common helper functions do their cleanups by themselves,
  no hidden usage of $tmp
- only remove/adjust necessary files, don't do large scale test updates

 common/rc         | 6 +++++-
 common/xfs        | 4 ++--
 tests/generic/100 | 2 +-
 tests/generic/260 | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

Patch

diff --git a/common/rc b/common/rc
index 269c24a..19ae697 100644
--- a/common/rc
+++ b/common/rc
@@ -544,7 +544,7 @@  _scratch_mkfs_ext4()
 {
 	local mkfs_cmd="$MKFS_EXT4_PROG -F"
 	local mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \""
-	local tmp=`mktemp`
+	local tmp=/tmp/$$._mkfs
 	local mkfs_status
 
 
@@ -566,6 +566,7 @@  _scratch_mkfs_ext4()
 	# output mkfs stdout and stderr
 	cat $tmp.mkfsstd
 	cat $tmp.mkfserr >&2
+	rm -f $tmp.*
 
 	return $mkfs_status
 }
@@ -1244,6 +1245,7 @@  _do()
     (eval "echo '---' \"$_cmd\"") >>$seqres.full
     (eval "$_cmd") >$tmp._out 2>&1; ret=$?
     cat $tmp._out | _fix_malloc >>$seqres.full
+    rm -f $tmp._out
     if [ $# -eq 2 ]; then
 	if [ $ret -eq 0 ]; then
 	    echo "done"
@@ -3167,8 +3169,10 @@  run_fsx()
 	"$@" 2>&1 | tee -a $seqres.full >$tmp.fsx
 	if [ ${PIPESTATUS[0]} -ne 0 ]; then
 		cat $tmp.fsx
+		rm -f $tmp.fsx
 		exit 1
 	fi
+	rm -f $tmp.fsx
 }
 
 # Test for the existence of a sysfs entry at /sys/fs/$FSTYP/DEV/$ATTR
diff --git a/common/xfs b/common/xfs
index 767a481..4859971 100644
--- a/common/xfs
+++ b/common/xfs
@@ -82,7 +82,7 @@  _scratch_mkfs_xfs()
 	local mkfs_cmd="`_scratch_mkfs_xfs_opts`"
 	local mkfs_filter="sed -e '/less than device physical sector/d' \
 			       -e '/switching to logical sector/d'"
-	local tmp=`mktemp`
+	local tmp=/tmp/$$._mkfs
 	local mkfs_status
 
 	_scratch_do_mkfs "$mkfs_cmd" "$mkfs_filter" $* 2>$tmp.mkfserr 1>$tmp.mkfsstd
@@ -104,7 +104,7 @@  _scratch_mkfs_xfs()
 	# output mkfs stdout and stderr
 	cat $tmp.mkfsstd
 	cat $tmp.mkfserr >&2
-	rm -f $tmp*
+	rm -f $tmp.*
 
 	return $mkfs_status
 }
diff --git a/tests/generic/100 b/tests/generic/100
index e5e819d..161982f 100755
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -38,7 +38,7 @@  trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
-     rm -f $tmp.* $testfile
+     rm -f $tmp.* $TEMP_DIR/$TAR_FILE
 }
  
 # real QA test starts here
diff --git a/tests/generic/260 b/tests/generic/260
index 312e6d2..4c15292 100755
--- a/tests/generic/260
+++ b/tests/generic/260
@@ -26,7 +26,7 @@  seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 here=`pwd`
-tmp=`mktemp -d`
+tmp=/tmp/$$
 status=0
 trap "exit \$status" 0 1 2 3 15
 chpid=0