diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-04-07 02:43:38 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-04-07 02:43:38 -0400 |
| commit | ee3872232ffc40ab0ae7ea823059806f839f2700 (patch) | |
| tree | 3372902f39b0995a39b62851671fe33e4ceeb56e | |
| parent | eb6efe735e1dbd7f5826998e3f88b6cc99c64d54 (diff) | |
| parent | 00ff70f6038a20c09968bc7b1cd2309916e178a8 (diff) | |
Merge commit 'jrollins/master'
| -rwxr-xr-x | Makefile | 2 | ||||
| -rw-r--r-- | tests/common | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 e53c31e..a000c56 100644 --- 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..." |