diff --git a/tests/external_test.sh b/tests/external_test.sh index 2f7f539..54fd5b5 100755 --- a/tests/external_test.sh +++ b/tests/external_test.sh @@ -1,14 +1,5 @@ #!/bin/sh -timeout 120 ./uts-server -c tests/cfg/uts-server.cnf -D -p ./uts-server.pid & - -sleep 1 -./goodies/timestamp-file.sh -i README.rst -u http://localhost:2020 -r -O "-cert" || exit 1 -./goodies/timestamp-file.sh -i README.rst -u http://localhost:2020 -r -O "-cert" || exit 1 -./goodies/timestamp-file.sh -i README.rst -u http://localhost:2020 -r -O "-cert" || exit 1 - -kill `cat ./uts-server.pid` - if which timeout >/dev/null 2>&1 then TO="timeout 120" @@ -16,6 +7,15 @@ else TO="" fi +$TO ./uts-server -c tests/cfg/uts-server.cnf -D -p ./uts-server.pid & + +sleep 1 +./goodies/timestamp-file.sh -i README.rst -u http://localhost:2020 -r -O "-cert" || exit 1 +./goodies/timestamp-file.sh -i README.rst -u http://localhost:2020 -r -O "-cert" || exit 1 +./goodies/timestamp-file.sh -i README.rst -u http://localhost:2020 -r -O "-cert" || exit 1 + +kill `cat ./uts-server.pid` + $TO ./uts-server -c tests/cfg/uts-server-ssl.cnf -D -p ./uts-server.pid & sleep 1 @@ -24,4 +24,3 @@ sleep 1 ./goodies/timestamp-file.sh -i README.rst -u https://localhost:2020 -r -O "-cert" -C '-k' || exit 1 kill `cat ./uts-server.pid` -