Merge commit 'jrollins/master'

diff --git a/Makefile b/Makefile
index 5f87a161bcd3aed9872c20c4bab7047ecea08f6a..1744ea87f3fb6a716adaefbd1a6d9b0d776cfc55 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ releasenote:
        ./utils/build-releasenote
 
 test:
+       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/keytrans
        MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/basic
 
 .PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote test

diff --git a/tests/keytrans b/tests/keytrans
index 285d17bff711a6c998ca18e7aad3353b3b29cca4..bad2ae3a15839f8dd27d2245f3bd2fcfce3ac178 100755 (executable)
--- 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