aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-03-22 21:51:05 +0000
committerJoão Valverde <j@v6e.pt>2016-03-23 15:15:22 +0000
commitaedc4af6c11817c186771c9ae3ba2fe1f49567cb (patch)
tree793520947865291ee6b3db5ad8a251700c5707d0 /test
parent6a3a85f3183be9c7e421b2509c241413cd171913 (diff)
Use absolute path for test suite TEST_OUTDIR
Error out if it can't be created. Change-Id: I1a087f0e0cc064be7a417b9a2e66cf3c940e02fa Reviewed-on: https://code.wireshark.org/review/14565 Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'test')
-rwxr-xr-xtest/test.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test.sh b/test/test.sh
index 67abab7d81..323293b33f 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -77,13 +77,13 @@ source $MYDIR/test-backend.sh
source $MYDIR/config.sh
# needed by some tests
-TEST_OUTDIR=$(mktemp -d wstest.XXXXXXXXXX)
-TEST_OUTDIR_CLEAN=${TEST_OUTDIR_CLEAN:-1}
-if [ -z "$TEST_OUTDIR" ] || ! cd "$TEST_OUTDIR"; then
- # If for any reason the temporary tests output directory cannot be created...
- TEST_OUTDIR=.
- TEST_OUTDIR_CLEAN=0
+TEST_OUTDIR="$PWD/$(mktemp -d wstest.XXXXXXXXXX)"
+if [ $? -ne 0 ] || [ ! -d "$TEST_OUTDIR" ] || ! cd "$TEST_OUTDIR"; then
+ # Error out if TEST_OUTDIR cannot be created
+ echo "Failed to create directory '$TEST_OUTDIR'"
+ exit 1
fi
+TEST_OUTDIR_CLEAN=${TEST_OUTDIR_CLEAN:-1}
# Configuration paths
HOME_ENV="HOME"