tests no longer prompt for bash for inspection unless MONKEYSPHERE_TEST_ALLOW_EXAMINA...

diff --git a/tests/basic b/tests/basic
index b1fe9edcf9ebe08fddebc60b7d766041c902bbc1..f6d1f3bb1538e8c3e624b4812a0d18b8172f3417 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -112,7 +112,7 @@ 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.
-export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH"
+export PATH="$TESTDIR"/../src:"$PATH"
 
 export MONKEYSPHERE_SYSDATADIR="$TEMPDIR"
 export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"

diff --git a/tests/common b/tests/common
index 30c6a8214f84fdd3c78ff2a40744bc45f18ab8cb..e53c31ed72e426726353a0ed0b10206e8815e261 100644 (file)
--- a/tests/common
+++ b/tests/common
@@ -3,11 +3,13 @@
 failed_cleanup() {
     # FIXME: can we be more verbose here?
     echo 'FAILED!'
-    read -p "press enter to cleanup and remove tmp (or type bash for a subshell to examine): " XX
-    if [ "$XX" = bash ] ; then
-       echo "Entering subshell..."
-       cd "$TEMPDIR"
-       bash
+    if [ "$MONKEYSPHERE_TEST_ALLOW_EXAMINATION" = prompt ] ; then
+       read -p "press enter to cleanup and remove tmp (or type bash for a subshell to examine): " XX
+       if [ "$XX" = bash ] ; then
+           echo "Entering subshell..."
+           cd "$TEMPDIR"
+           bash
+       fi
     fi
 
     cleanup