make test prompt for shell on failure enbabled by default, and turned off with env...

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

diff --git a/tests/common b/tests/common
index e53c31ed72e426726353a0ed0b10206e8815e261..a000c565a2d4b2045c2ad425307945598484596d 100644 (file)
--- a/tests/common
+++ b/tests/common
@@ -3,7 +3,7 @@
 failed_cleanup() {
     # FIXME: can we be more verbose here?
     echo 'FAILED!'
-    if [ "$MONKEYSPHERE_TEST_ALLOW_EXAMINATION" = prompt ] ; then
+    if [ -z "$MONKEYSPHERE_TEST_NO_EXAMINE" ] ; 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..."