From: Jameson Graef Rollins Date: Tue, 4 Nov 2008 17:44:11 +0000 (-0500) Subject: very minor changes to test script X-Git-Tag: monkeysphere_0.20-1~6^2~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19dda210d51a9787f7f3cd8fea1f59220bb83859;p=monkeysphere.git very minor changes to test script --- 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