Regression test portability: mktemp

Linux mktemp accepts to run without a template, NetBSD mandates it. Since
the template option has the same syntax, add it everywhere. While there,
also do this in scripts outside of regression testing.

BUG: 764655
Change-Id: I3ec140afbc9009257c81a56d77afcc21fef74cc4
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8432
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Harshavardhana <harsha@harshavardhana.net>

9 files changed, 10 insertions, 10 deletions

diff --git a/extras/geo-rep/generate-gfid-file.sh b/extras/geo-rep/generate-gfid-file.sh
index c6739fbf140..0b7f60f48e5 100644
--- a/extras/geo-rep/generate-gfid-file.sh
+++ b/extras/geo-rep/generate-gfid-file.sh
@@ -18,7 +18,7 @@ function mount_client()
     GFID_CMD=$3;
     OUTPUT=$4;
 
-    T=$(mktemp -d);
+    T=$(mktemp -d -t ${0##*/}.XXXXXX);
 
     glusterfs -s $VOLFILE_SERVER --volfile-id $VOLUME $T;
 
diff --git a/extras/geo-rep/gsync-upgrade.sh b/extras/geo-rep/gsync-upgrade.sh
index b179487365a..0f73a33884b 100644
--- a/extras/geo-rep/gsync-upgrade.sh
+++ b/extras/geo-rep/gsync-upgrade.sh
@@ -75,7 +75,7 @@ function mount_client()
     GFID_FILE=$3
     SYNC_CMD=$4
 
-    T=$(mktemp -d);
+    T=$(mktemp -d -t ${0##*/}.XXXXXX);
 
     glusterfs --aux-gfid-mount -s $1 --volfile-id $2 $T;
 
diff --git a/extras/geo-rep/slave-upgrade.sh b/extras/geo-rep/slave-upgrade.sh
index 6198f408af7..3a37f8e3579 100644
--- a/extras/geo-rep/slave-upgrade.sh
+++ b/extras/geo-rep/slave-upgrade.sh
@@ -55,7 +55,7 @@ function mount_client()
     GFID_FILE=$3
     SYNC_CMD=$4
 
-    T=$(mktemp -d);
+    T=$(mktemp -d -t ${0##*/}.XXXXXX);
 
     glusterfs --aux-gfid-mount -s $1 --volfile-id $VOLUME_NAME $T;
 
diff --git a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
index d18367fc9df..9e72464d161 100755
--- a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
+++ b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
@@ -12,7 +12,7 @@
 ##---------------------------------------------------------------------------
 
 QUOTA_CONFIG_XATTR="trusted.glusterfs.quota.limit-set";
-MOUNT_DIR=`mktemp --directory --tmpdir`;
+MOUNT_DIR=`mktemp -d -t ${0##*/}.XXXXXX`;
 OPTSPEC="volname:,version:,gd-workdir:,volume-op:"
 PROGNAME="Quota-xattr-heal-add-brick"
 VOL_NAME=
diff --git a/geo-replication/src/gverify.sh b/geo-replication/src/gverify.sh
index f2295649571..c5593a39f11 100755
--- a/geo-replication/src/gverify.sh
+++ b/geo-replication/src/gverify.sh
@@ -24,7 +24,7 @@ function cmd_master()
     cmd_line=$(cat <<EOF
 function do_verify() {
 v=\$1;
-d=\$(mktemp -d 2>/dev/null);
+d=\$(mktemp -d -t ${0##*/}.XXXXXX 2>/dev/null);
 glusterfs -s localhost --xlator-option="*dht.lookup-unhashed=off" --volfile-id \$v -l $slave_log_file \$d;
 i=\$(stat -c "%i" \$d);
 if [[ "\$i" -ne "1" ]]; then
@@ -80,7 +80,7 @@ function slave_stats()
     local ver;
     local status;
 
-    d=$(mktemp -d 2>/dev/null);
+    d=$(mktemp -d -t ${0##*/}.XXXXXX 2>/dev/null);
     glusterfs --xlator-option="*dht.lookup-unhashed=off" --volfile-server $SLAVEHOST --volfile-id $SLAVEVOL -l $slave_log_file $d;
     i=$(stat -c "%i" $d);
     if [[ "$i" -ne "1" ]]; then
diff --git a/tests/basic/ec/ec-common b/tests/basic/ec/ec-common
index b52fecbd9a9..89b972b147a 100644
--- a/tests/basic/ec/ec-common
+++ b/tests/basic/ec/ec-common
@@ -14,7 +14,7 @@ function fragment_size
 
 cleanup
 
-tmp=`mktemp -d`
+tmp=`mktemp -d -t ${0##*/}.XXXXXX`
 if [ ! -d $tmp ]; then
     exit 1
 fi
diff --git a/tests/basic/ec/ec.t b/tests/basic/ec/ec.t
index e81de0d97bd..d069fac4fec 100644
--- a/tests/basic/ec/ec.t
+++ b/tests/basic/ec/ec.t
@@ -143,7 +143,7 @@ EXPECT 'Started' volinfo_field $V0 'Status'
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0
 
 # Create local files for comparisons etc.
-tmpdir=$(mktemp -d)
+tmpdir=$(mktemp -d -t ${0##*/}.XXXXXX)
 trap "rm -rf $tmpdir" EXIT
 TEST create_file $tmpdir/create-write 10
 TEST create_file $tmpdir/truncate 10
diff --git a/tests/basic/ec/self-heal.t b/tests/basic/ec/self-heal.t
index 99cfd9420aa..f3f2cc23d3f 100644
--- a/tests/basic/ec/self-heal.t
+++ b/tests/basic/ec/self-heal.t
@@ -7,7 +7,7 @@
 
 cleanup
 
-tmp=`mktemp -d`
+tmp=`mktemp -d -t ${0##*/}.XXXXXX`
 if [ ! -d $tmp ]; then
     exit 1
 fi
diff --git a/tests/bugs/bug-1110917.t b/tests/bugs/bug-1110917.t
index 927b2342192..4b67293a2c0 100644
--- a/tests/bugs/bug-1110917.t
+++ b/tests/bugs/bug-1110917.t
@@ -17,7 +17,7 @@ TEST $CLI volume set $V0 changelog on
 TEST $CLI volume set $V0 changelog.fsync-interval 1
 
 # perform I/O on the background
-f=$(basename `mktemp`)
+f=$(basename `mktemp -t ${0##*/}.XXXXXX`)
 dd if=/dev/urandom of=$M0/$f count=100000 bs=4k &
 
 # this is the best we can do without inducing _error points_ in the code