From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 4 Jul 2014 02:16:48 +0000 (-0400)
Subject: tests: avoid using mktemp -t
X-Git-Tag: v1.42.11~46
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=bdeb2dba2926ea7425bcae39b0f9eeb1cb9fb1fc;p=tools%2Fe2fsprogs.git

tests: avoid using mktemp -t

The -t option is documented as deprecated in GNU's mktemp, and
FreeBSD's mktemp doesn't support it at all.

Replace it with the construct "mktemp ${TMPDIR:-/tmp}/foo.XXXXXX"

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

diff --git a/contrib/e2croncheck b/contrib/e2croncheck
index 87204be..de0b41f 100755
--- a/contrib/e2croncheck
+++ b/contrib/e2croncheck
@@ -23,7 +23,7 @@ VOLUME=root
 SNAPSIZE=100m
 EMAIL=sysadmin@example.com
 
-TMPFILE=`mktemp -t e2fsck.log.XXXXXXXXXX`
+TMPFILE=`mktemp ${TMPDIR:-/tmp}/e2fsck.log.XXXXXXXXXX`
 
 OPTS="-Fttv -C0"
 #OPTS="-Fttv -E fragcheck"
diff --git a/tests/scripts/resize_test b/tests/scripts/resize_test
index 1e5756c..a12e4b9 100755
--- a/tests/scripts/resize_test
+++ b/tests/scripts/resize_test
@@ -21,7 +21,7 @@ if truncate -s $SIZE_2 $TMPFILE 2> /dev/null; then
 	echo "using $TMPFILE" >> $LOG
 else
 	rm $TMPFILE
-	export TMPFILE=$(TMPDIR=. mktemp -t $test_name.tmp.XXXXXX)
+	export TMPFILE=$(mktemp ./$test_name.tmp.XXXXXX)
 	touch $TMPFILE
 	echo "using $TMPFILE" >> $LOG
 	if ! truncate -s $SIZE_2 $TMPFILE >> $LOG 2>&1; then
@@ -34,7 +34,7 @@ fi
 echo $MKE2FS $FEATURES -qF $TMPFILE $SIZE_1 >> $LOG
 $MKE2FS $FEATURES -qF $TMPFILE $SIZE_1 >> $LOG
 
-OUT_TMP=$(mktemp -t csum-tmp.XXXXXX)
+OUT_TMP=$(mktemp ${TMPDIR:-/tmp}/csum-tmp.XXXXXX)
 
 date > $OUT_TMP
 cat $E2FSCK >> $OUT_TMP
diff --git a/tests/test_one.in b/tests/test_one.in
index eb28313..c2bd1a1 100644
--- a/tests/test_one.in
+++ b/tests/test_one.in
@@ -30,7 +30,7 @@ fi
 
 test_name=`echo $test_dir | sed -e 's;.*/;;'`
 
-TMPFILE=$(mktemp -t e2fsprogs-tmp-$test_name.XXXXXX)
+TMPFILE=$(mktemp ${TMPDIR:-/tmp}/e2fsprogs-tmp-$test_name.XXXXXX)
 trap 'rm -f $TMPFILE ; exit' 1 2 15
 
 if [ -f $test_dir ] ; then