projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8ba6192
)
very minor changes to test script
author
Jameson Graef Rollins
<jrollins@phys.columbia.edu>
Tue, 4 Nov 2008 17:44:11 +0000
(12:44 -0500)
committer
Jameson Graef Rollins
<jrollins@phys.columbia.edu>
Tue, 4 Nov 2008 17:44:11 +0000
(12:44 -0500)
tests/basic
patch
|
blob
|
history
diff --git
a/tests/basic
b/tests/basic
index d86388665492ba6e3336df8a8a2b4a478ef05a70..c38a74b96c67c72684ca05aaa5ab59fd2b17f321 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-13,11
+13,11
@@
# all subcommands in this script should complete without failure:
set -e
# 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:
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?
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_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
# 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