X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fstop-server.sh;h=256d512eeb17f7ad1787d71e6e22601561290399;hb=5049c5c694281f63d56e138d2333fefed4cfe47a;hp=30b5df94363b289a16bcd10e6d13dc16928fa5da;hpb=c4d78a346942afdaf6bd19f8cad88d6678eaa608;p=ngircd-alex.git

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index 30b5df94..256d512e 100755
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,10 +1,32 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.1 2002/09/09 10:16:24 alex Exp $
+# $Id: stop-server.sh,v 1.13 2004/09/06 22:04:06 alex Exp $
 
-echo "      stopping server ..."
+[ -z "$srcdir" ] && srcdir=`dirname $0`
 
-pid=`ps a | grep ngircd-test | head -n 1 | cut -d ' ' -f 1`
-kill $pid > /dev/null 2>&1
+# read in functions
+. ${srcdir}/functions.inc
+
+echo_n "      stopping server ..."
+
+# stop test-server ...
+pid=`./getpid.sh T-ngircd`
+if [ -z "$pid" ]; then
+  echo " failure: no running server found!?"
+  exit 1
+fi
+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
+done
+echo " failure: server still running!?"
+exit 1
 
 # -eof-