X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fkeytrans;h=bad2ae3a15839f8dd27d2245f3bd2fcfce3ac178;hb=48af03c6bade14ec20256c24ef234cab79e1fb35;hp=285d17bff711a6c998ca18e7aad3353b3b29cca4;hpb=7a96cfb6bfa9f5ab8cc82930049b0c46097a2634;p=monkeysphere.git

diff --git a/tests/keytrans b/tests/keytrans
index 285d17b..bad2ae3 100755
--- a/tests/keytrans
+++ b/tests/keytrans
@@ -30,17 +30,16 @@ trap failed_cleanup EXIT
 ## set up some variables to ensure that we're operating strictly in
 ## the tests, not system-wide:
 
-# make temp dir
-TEMPDIR="$TESTDIR"/tmp
-if [ -e "$TEMPDIR" ] ; then
-    echo "tempdir '$TEMPDIR' already exists."
-    exit 1
-fi
-mkdir -p "$TEMPDIR"
+mkdir -p "$TESTDIR"/tmp
+TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX")
+
+mkdir "$TEMPDIR"/bin
+ln -s "$TESTDIR"/../src/share/keytrans "$TEMPDIR"/bin/openpgp2ssh
+ln -s "$TESTDIR"/../src/share/keytrans "$TEMPDIR"/bin/pem2openpgp
 
 # Use the local copy of executables first, instead of system ones.
 # This should help us test without installing.
-export PATH="$TESTDIR"/../src/keytrans:"$PATH"
+export PATH="$TEMPDIR"/bin:"$PATH"
 
 ######################################################################
 ### TEST KEYTRANS