summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-11-04 12:44:11 -0500
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-11-04 12:44:11 -0500
commit19dda210d51a9787f7f3cd8fea1f59220bb83859 (patch)
tree9bbb95fe04f63c391c33be498c5fbba4bcc95b27
parent8ba61926bbe8609c4e5a9c9e5e0b12644880de92 (diff)
very minor changes to test script
-rwxr-xr-xtests/basic3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/basic b/tests/basic
index d863886..c38a74b 100755
--- a/tests/basic
+++ b/tests/basic
@@ -13,11 +13,11 @@
# all subcommands in this script should complete without failure:
set -e
+# piped commands should return the code of the first non-zero return
set -o pipefail
## make sure that the right tools are installed to run the test. the
## test has *more* requirements than plain ol' monkeysphere:
-
which socat || { echo "You must have socat installed to run this test." ; exit 1; }
## FIXME: other checks?
@@ -121,7 +121,6 @@ export MONKEYSPHERE_LOG_LEVEL=DEBUG
export SSHD_CONFIG="$TEMPDIR"/sshd_config
export SOCKET="$TEMPDIR"/ssh-socket
-export SSHD_PID=
# Make sure $DISPLAY is set to convince ssh and monkeysphere to fall
# back on $SSH_ASKPASS. Make sure it's not set to the current actual