X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbasic;h=470fffa9ff73c73d95d0ea99c9441c7991232fd7;hb=54d5b4d4dd11e432cec4506d1a1eae1d13eb7f0e;hp=b0b5e9bc42522d169009fcee69e8827016f73774;hpb=f6b18f9a4ad203fd0e02bc7dab298246ffd4ea22;p=monkeysphere.git 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.