summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-18 16:42:03 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-18 16:42:03 +0100
commit81095f0ee26cf700d7f18b9a35e5c3c2acd39f8d (patch)
tree39872d440aff56bda15fbf8beacc6040c71b0428
parent436ee738eba6e729abfd9e212b4b1245a227de50 (diff)
downloadjenkins.debian.net-81095f0ee26cf700d7f18b9a35e5c3c2acd39f8d.tar.xz
torbrowser tests: use mktemp -t properly
-rwxr-xr-xbin/test_torbrowser-launcher.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 34412078..9010e6ec 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -125,7 +125,7 @@ download_and_launch() {
echo "$(date -u) - starting awesome."
timeout -k 30m 29m schroot --run-session -c $SESSION --preserve-environment -- awesome &
sleep 2
- DBUS_SESSION_FILE=$(mktemp)
+ DBUS_SESSION_FILE=$(mktemp -t torbrowser-launcher-XXXXXX)
DBUS_SESSION_POINTER=$(schroot --run-session -c $SESSION --preserve-environment -- ls $HOME/.dbus/session-bus/ -t1 | head -1)
schroot --run-session -c $SESSION --preserve-environment -- cat $HOME/.dbus/session-bus/$DBUS_SESSION_POINTER > $DBUS_SESSION_FILE
. $DBUS_SESSION_FILE && export DBUS_SESSION_BUS_ADDRESS
@@ -281,8 +281,8 @@ if [ -z "$1" ] ; then
fi
SUITE=$1
UPGRADE_SUITE=""
-TMPDIR=$(mktemp -d) # where everything actually happens
-TBL_LOGFILE=$(mktemp)
+TMPDIR=$(mktemp -d -t torbrowser-launcher-XXXXXX) # where everything actually happens
+TBL_LOGFILE=$(mktemp -t torbrowser-launcher-XXXXXX)
SESSION="tbb-launcher-$SUITE-$(basename $TMPDIR)"
STARTTIME=$(date +%Y%m%d%H%M)
VIDEO=test-torbrowser-${SUITE}_$STARTTIME.mpg