X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fstop-server.sh;h=7e6ee4f76b5e5c8afdae76d35fabbc7fee450d7c;hb=a988bbc86aed404b7bcfdbceafc030ea4bc5ecab;hp=1b966bab04223d4dc0754342aad029f69f0b20ac;hpb=c5bdd86f96906a5367568d5210be59d1d36677e5;p=ngircd-alex.git diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh index 1b966bab..7e6ee4f7 100755 --- a/src/testsuite/stop-server.sh +++ b/src/testsuite/stop-server.sh @@ -1,13 +1,21 @@ #!/bin/sh # ngIRCd Test Suite -# $Id: stop-server.sh,v 1.11 2004/09/04 19:14:46 alex Exp $ [ -z "$srcdir" ] && srcdir=`dirname $0` -echo -n " stopping server ..." +# read in functions +. ${srcdir}/functions.inc + +if [ -n "$1" ]; then + id="$1"; shift +else + id="1" +fi + +echo_n " stopping server ${id} ..." # stop test-server ... -pid=`./getpid.sh T-ngircd` +pid=`./getpid.sh T-ngircd${id}` if [ -z "$pid" ]; then echo " failure: no running server found!?" exit 1 @@ -17,13 +25,13 @@ 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 -eq 0 ]; then + if [ $r -ne 0 ]; then echo " ok". exit 0 fi sleep 1 done -echo " failure: server still running!?" +echo " failure: server ${id} still running!?" exit 1 # -eof-