diff options
Diffstat (limited to 'src/testsuite/stop-server.sh')
| -rwxr-xr-x | src/testsuite/stop-server.sh | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh index c531137e..c5a9486c 100755 --- a/src/testsuite/stop-server.sh +++ b/src/testsuite/stop-server.sh @@ -1,10 +1,11 @@ #!/bin/sh # ngIRCd Test Suite -[ -z "$srcdir" ] && srcdir=`dirname $0` +[ -z "$srcdir" ] && srcdir=`dirname "$0"` +set -u # read in functions -. ${srcdir}/functions.inc +. "${srcdir}/functions.inc" if [ -n "$1" ]; then id="$1"; shift @@ -17,21 +18,19 @@ echo_n "stopping server ${id} ..." # stop test-server ... pid=`./getpid.sh T-ngircd${id}` if [ -z "$pid" ]; then - echo " failure: no running server found!?" - exit 1 + echo " failure: no running server found!?" + exit 1 fi -kill $pid > /dev/null 2>&1 || exit 1 +kill $pid >/dev/null 2>&1 || exit 1 # waiting ... for i in 1 2 3 4 5; do - kill -0 $pid > /dev/null 2>&1; r=$? - if [ $r -ne 0 ]; then - echo " ok". - exit 0 - fi - sleep 1 + kill -0 $pid >/dev/null 2>&1; r=$? + if [ $r -ne 0 ]; then + echo " ok". + exit 0 + fi + sleep 1 done echo " failure: server ${id} still running!?" exit 1 - -# -eof- |