From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 11 Jul 2009 23:04:05 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~24^2~2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0e288e3ce07ff84830aeaa414191666fad55db6b;hp=56f591cdd4f4e7032d573f2942f7b6cf3a01c8c2;p=monkeysphere.git

Merge commit 'jrollins/master'
---

diff --git a/Makefile b/Makefile
index 5f87a16..1744ea8 100755
--- 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 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