X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fstop-server.sh;h=256d512eeb17f7ad1787d71e6e22601561290399;hb=450251f082e0d9b4b1cbdf803e061ca5b5fcf9ab;hp=a9cce99f87760f4a4f44d6c358efeac853dae654;hpb=797f9170d70507a79deaead97c74352a9cc3a929;p=ngircd-alex.git

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index a9cce99f..256d512e 100755
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,17 +1,32 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.9 2002/11/10 14:28:06 alex Exp $
+# $Id: stop-server.sh,v 1.13 2004/09/06 22:04:06 alex Exp $
 
 [ -z "$srcdir" ] && srcdir=`dirname $0`
 
-echo "      stopping server ..."
+# read in functions
+. ${srcdir}/functions.inc
 
-# Test-Server stoppen ...
+echo_n "      stopping server ..."
+
+# stop test-server ...
 pid=`./getpid.sh T-ngircd`
-[ -n "$pid" ] && kill $pid > /dev/null 2>&1 || exit 1
-sleep 1
+if [ -z "$pid" ]; then
+  echo " failure: no running server found!?"
+  exit 1
+fi
+kill $pid > /dev/null 2>&1 || exit 1
 
-# jetzt duerfte der Prozess nicht mehr laufen
-kill -0 $pid > /dev/null 2>&1 && exit 1 || exit 0
+# 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-