Test suite: Correctly test for LOGNAME and USER

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

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index 0064baf2bf3662b0903f8356452347d327f009c4..c5a9486c4797a90a1a66c8fb10088be4cc479f6d 100755 (executable)
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,15 +1,36 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.6 2002/09/20 13:57:01 alex Exp $
 
-echo "      stopping server ..."
+[ -z "$srcdir" ] && srcdir=`dirname "$0"`
+set -u
 
-PS_FLAGS=-f; PS_PIDCOL=2
-ps $PS_FLAGS > /dev/null 2>&1
-if [ $? -ne 0 ]; then PS_FLAGS=a; PS_PIDCOL=1; fi
+# read in functions
+. "${srcdir}/functions.inc"
 
-ps $PS_FLAGS > procs.tmp
-pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$$PS_PIDCOL }"`
-[ -n "$pid" ] && kill -0 $pid > /dev/null 2>&1 || exit 1
+if [ -n "$1" ]; then
+       id="$1"; shift
+else
+       id="1"
+fi
 
-# -eof-
+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
+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 ${id} still running!?"
+exit 1