X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fstart-server.sh;h=8d6c650674d183706bd97ff66e69df107c5311b5;hb=ceafdf109b724d1c5640a3f437c2ef6c7492289b;hp=8969dcddbc99097c21e8249f5ad05b63c12aeeee;hpb=b5d6597c0ab0c7aa2ada7a9083cbc49f5c92e286;p=ngircd-alex.git

diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 8969dcdd..8d6c6506 100755
--- a/src/testsuite/start-server.sh
+++ b/src/testsuite/start-server.sh
@@ -1,22 +1,44 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: start-server.sh,v 1.6 2002/09/18 20:58:56 alex Exp $
+# $Id: start-server.sh,v 1.14 2004/09/06 22:04:06 alex Exp $
 
-echo "      starting server ..."
+[ -z "$srcdir" ] && srcdir=`dirname $0`
 
-rm -rf logs
+# read in functions
+. ${srcdir}/functions.inc
 
+echo_n "      starting server ..."
+
+# remove old logfiles
+rm -rf logs *.log
+
+# check weather getpid.sh returns valid PIDs. If not, don't start up the
+# test-server, because we won't be able to kill it at the end of the test.
+./getpid.sh sh > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  echo " getpid.sh failed!"
+  exit 1
+fi
+
+# check if there is a test-server already running
+./getpid.sh T-ngircd > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+  echo " failure: test-server already running!"
+  exit 1
+fi
+
+# generate MOTD for test-server
 echo "This is an ngIRCd Test Server" > ngircd-test.motd
 
-./ngircd-TEST -np -f ${srcdir}/ngircd-test.conf > ngircd-test.log 2>&1 &
+# starting up test-server ...
+./T-ngircd -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
+# validate running test-server
+pid=`./getpid.sh T-ngircd`
+[ -n "$pid" ] && kill -0 $pid > /dev/null 2>&1; r=$?
 
-ps $PS_FLAGS > procs.tmp
-pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$$PS_PIDCOL }"`
-kill -0 $pid > /dev/null 2>&1
+[ $r -eq 0 ] && echo " ok." || echo " failure!"
+exit 
 
 # -eof-