projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eb815bc
)
try to make keytrans test useful again.
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sat, 11 Jul 2009 21:46:07 +0000
(17:46 -0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sat, 11 Jul 2009 21:46:07 +0000
(17:46 -0400)
tests/keytrans
patch
|
blob
|
history
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:
## 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.
# Use the local copy of executables first, instead of system ones.
# This should help us test without installing.
-export PATH="$TE
STDIR"/../src/keytrans
:"$PATH"
+export PATH="$TE
MPDIR"/bin
:"$PATH"
######################################################################
### TEST KEYTRANS
######################################################################
### TEST KEYTRANS