Backported all changes up to now from HEAD.

[ngircd.git] / src / testsuite / stop-server.sh

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index 3d1937045532b6f728aef3ab1b4bc6baab5b60e0..47aaef62da6c81af86a577ea7bfc5f45fa4790a7 100755 (executable)
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,15 +1,25 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.7 2002/09/20 14:46:55 alex Exp $
+# $Id: stop-server.sh,v 1.9.4.1 2003/11/07 20:51:11 alex Exp $
+
+[ -z "$srcdir" ] && srcdir=`dirname $0`
 
 echo "      stopping server ..."
 
-# Test-Server stoppen ...
-pid=`./getpid.sh ngircd-TEST`
-[ -n "$pid" ] && kill $pid > /dev/null 2>&1 || exit 1
-sleep 1
+# stop test-server ...
+pid=`./getpid.sh T-ngircd`
+if [ -z "$pid" ]; then
+  echo "      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 || exit 0
+  sleep 1
+done
+echo "      server still running!?"
+exit 1
 
 # -eof-