very minor changes to test script

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index 8e7f88a2daf83d52aa57dcb57843d752e9660911..c38a74b96c67c72684ca05aaa5ab59fd2b17f321 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -13,11 +13,12 @@
 
 # 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:
-
-[ -x $(which socat) ] || { echo "You must have socat installed to run this test." && exit 1 }
+which socat || { echo "You must have socat installed to run this test." ; exit 1; }
 
 ## FIXME: other checks?
 
@@ -120,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