Enhanced messages and exit codes.

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

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index d76871b88175e63755189a1ce3f9dbf31ccb3a22..1b966bab04223d4dc0754342aad029f69f0b20ac 100755 (executable)
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,25 +1,29 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.10 2003/08/22 11:31:18 alex Exp $
+# $Id: stop-server.sh,v 1.11 2004/09/04 19:14:46 alex Exp $
 
 [ -z "$srcdir" ] && srcdir=`dirname $0`
 
-echo "      stopping server ..."
+echo -n "      stopping server ..."
 
 # stop test-server ...
 pid=`./getpid.sh T-ngircd`
 if [ -z "$pid" ]; then
-  echo "      no running server found!?"
+  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 || exit 0
+  kill -0 $pid > /dev/null 2>&1; r=$?
+  if [ $r -eq 0 ]; then
+    echo " ok".
+    exit 0
+  fi
   sleep 1
 done
-echo "      server still running!?"
+echo " failure: server still running!?"
 exit 1
 
 # -eof-