From efedfe12ff27a450e85ff0b13c028c2dad1a72e4 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Fri, 20 Sep 2002 14:46:55 +0000
Subject: - Die PID des Test-Servers wird nun mit dem Script "getpid.sh"
 ermittelt.

---
 src/testsuite/stop-server.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/testsuite/stop-server.sh')

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index 0064baf2..3d193704 100755
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.6 2002/09/20 13:57:01 alex Exp $
+# $Id: stop-server.sh,v 1.7 2002/09/20 14:46:55 alex Exp $
 
 echo "      stopping server ..."
 
-PS_FLAGS=-f; PS_PIDCOL=2
-ps $PS_FLAGS > /dev/null 2>&1
-if [ $? -ne 0 ]; then PS_FLAGS=a; PS_PIDCOL=1; fi
+# Test-Server stoppen ...
+pid=`./getpid.sh ngircd-TEST`
+[ -n "$pid" ] && kill $pid > /dev/null 2>&1 || exit 1
+sleep 1
 
-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
+# jetzt duerfte der Prozess nicht mehr laufen
+kill -0 $pid > /dev/null 2>&1 && exit 1 || exit 0
 
 # -eof-
-- 
cgit 1.4.1