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 256d512eeb17f7ad1787d71e6e22601561290399..c5a9486c4797a90a1a66c8fb10088be4cc479f6d 100755 (executable)
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,32 +1,36 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.13 2004/09/06 22:04:06 alex Exp $
 
-[ -z "$srcdir" ] && srcdir=`dirname $0`
+[ -z "$srcdir" ] && srcdir=`dirname "$0"`
+set -u
 
 # read in functions
-. ${srcdir}/functions.inc
+. "${srcdir}/functions.inc"
 
-echo_n "      stopping server ..."
+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
+       echo " failure: no running server found!?"
+       exit 1
 fi
-kill $pid > /dev/null 2>&1 || exit 1
+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
+       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!?"
+echo " failure: server ${id} still running!?"
 exit 1
-
-# -eof-