diff options
| author | Michael Adam <obnox@samba.org> | 2010-02-22 23:12:51 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2010-02-22 23:12:51 +0100 |
| commit | d133eee36b3b479f1c5c6754ffb91c4eea706099 (patch) | |
| tree | 9f639c984e77422eeda70b9be7e14eed7cf9ee02 /tests/scripts | |
| parent | 2f6840fd8530afa5b65aa20e1a4b73321281f4f0 (diff) | |
| download | tinyproxy-d133eee36b3b479f1c5c6754ffb91c4eea706099.tar.gz tinyproxy-d133eee36b3b479f1c5c6754ffb91c4eea706099.zip | |
tests: Fix bug #79. Finish "make test" without waiting for user input.
Old behaviour is preserved by passing in the environment variable
TINYPROXY_TESTS_WAIT=yes.
Michael
Diffstat (limited to 'tests/scripts')
| -rwxr-xr-x | tests/scripts/run_tests.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index fdc1ee3..b83cff9 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -186,9 +186,11 @@ run_basic_webclient_request "$TINYPROXY_IP:$TINYPROXY_PORT" "http://$WEBSERVER_I echo -n "requesting statspage via stathost url..." run_basic_webclient_request "$TINYPROXY_IP:$TINYPROXY_PORT" "http://$TINYPROXY_STATHOST_IP" -echo "You can continue using the webserver and tinyproxy." -echo -n "hit <enter> to stop the servers and exit: " -read READ +if test "x$TINYPROXY_TESTS_WAIT" = "xyes"; then + echo "You can continue using the webserver and tinyproxy." + echo -n "hit <enter> to stop the servers and exit: " + read READ +fi stop_tinyproxy stop_webserver |