From: Daniel Kahn Gillmor Date: Thu, 5 Feb 2009 19:29:42 +0000 (-0500) Subject: restoring absolute paths to both TEMPDIR and TESTDIR in tests/basic. X-Git-Tag: monkeysphere_0.23~121^2~4 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=54d5b4d4dd11e432cec4506d1a1eae1d13eb7f0e;p=monkeysphere.git restoring absolute paths to both TEMPDIR and TESTDIR in tests/basic. --- diff --git a/tests/basic b/tests/basic index b0b5e9b..470fffa 100755 --- a/tests/basic +++ b/tests/basic @@ -17,7 +17,8 @@ set -e # piped commands should return the code of the first non-zero return set -o pipefail -export TESTDIR=$(dirname "$0") +# make sure the TESTDIR is an absolute path, not a relative one. +export TESTDIR=$(cd $(dirname "$0") && pwd) source "$TESTDIR"/common @@ -91,7 +92,7 @@ trap failed_cleanup EXIT # make temp dir mkdir -p "$TESTDIR"/tmp -TEMPDIR=$(mktemp -d ${TMPDIR:-$(cd "$TESTDIR" && printf "%s" $(pwd)/tmp)}/monkeyspheretest.XXXXXXX) +TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX)" # Use the local copy of executables first, instead of system ones. # This should help us test without installing.