X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Ftestsuite%2Fstart-server.sh;h=cdb802f4107a1d153e9d2aeb7a02b027ef3a9760;hp=8eef8b47d2390a9d2bb0b27523d56b5fb41f86c8;hb=efedfe12ff27a450e85ff0b13c028c2dad1a72e4;hpb=90ab7c7c48da57bcd7890b5809e99aa4b685c72a

diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 8eef8b47..cdb802f4 100755
--- a/src/testsuite/start-server.sh
+++ b/src/testsuite/start-server.sh
@@ -1,22 +1,30 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: start-server.sh,v 1.7 2002/09/20 13:57:01 alex Exp $
+# $Id: start-server.sh,v 1.8 2002/09/20 14:46:55 alex Exp $
 
 echo "      starting server ..."
 
-rm -rf logs
+# alte Logfiles loeschen
+rm -rf logs *.log
 
+# pruefen, ob getpid.sh gueltige PID's liefert. Wenn dem nicht so ist,
+# wird kein ngIRCd gestartet, da dieser ansonsten nicht mehr am Ende
+# des Testlaufs beendet werden koennte!
+./getpid.sh make > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  echo "      error: getpid.sh FAILED!"
+  exit 1
+fi
+
+# MOTD fuer Test-Server erzeugen
 echo "This is an ngIRCd Test Server" > ngircd-test.motd
 
+# Test-Server starten ...
 ./ngircd-TEST -np -f ${srcdir}/ngircd-test.conf > ngircd-test.log 2>&1 &
 sleep 1
 
-PS_FLAGS=-f; PS_PIDCOL=2
-ps $PS_FLAGS > /dev/null 2>&1
-if [ $? -ne 0 ]; then PS_FLAGS=a; PS_PIDCOL=1; fi
-
-ps $PS_FLAGS > procs.tmp
-pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$$PS_PIDCOL }"`
+# validieren, dass Server laeuft
+pid=`./getpid.sh ngircd-TEST`
 [ -n "$pid" ] && kill -0 $pid > /dev/null 2>&1 || exit 1
 
 # -eof-