From 33be39b42f3b9b0505f83a509ff87d416e106158 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Fri, 8 Aug 2014 05:39:38 +0200 Subject: 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 Reviewed-on: http://review.gluster.org/8432 Tested-by: Gluster Build System Reviewed-by: Harshavardhana Tested-by: Harshavardhana --- extras/geo-rep/generate-gfid-file.sh | 2 +- extras/geo-rep/gsync-upgrade.sh | 2 +- extras/geo-rep/slave-upgrade.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'extras/geo-rep') 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; -- cgit