summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-29 02:17:54 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-29 02:17:54 -0400
commit37c5b03dbe70f8f3fe24d15318645e1678841879 (patch)
tree07a90c2edd0dcc44665a9301f856335609442096 /tests
parente4dbd96969a8e844b71a167238bc126d66155c31 (diff)
added comments and changelog notes about why the test script sets $DISPLAY
Diffstat (limited to 'tests')
-rwxr-xr-xtests/basic4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/basic b/tests/basic
index c85b449..d735578 100755
--- a/tests/basic
+++ b/tests/basic
@@ -115,6 +115,10 @@ 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
+# $DISPLAY (if one exists) because this test suite should not be doing
+# *anything* with any running X11 session.
export DISPLAY=monkeys
### CONFIGURE ENVIRONMENTS