- es wird nun getestet, mit welchen Parametern "ps" aufgerufen werden muss.

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

diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 51de410ec4f2aa49e5bcd5ddda13f007153089c8..8b1550395b95839f4a6541efd57ccb81d88ce39e 100755 (executable)
--- a/src/testsuite/start-server.sh
+++ b/src/testsuite/start-server.sh
@@ -1,17 +1,22 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: start-server.sh,v 1.2 2002/09/09 22:56:07 alex Exp $
+# $Id: start-server.sh,v 1.5 2002/09/16 09:53:16 alex Exp $
 
 echo "      starting server ..."
 
+rm -rf logs
+
 echo "This is an ngIRCd Test Server" > ngircd-test.motd
 
-../ngircd/ngircd -np -f ngircd-test.conf > ngircd-test.log 2>&1 &
+./ngircd-TEST -np -f ${srcdir}/ngircd-test.conf > ngircd-test.log 2>&1 &
 sleep 1
 
-pid=`ps a | grep ngircd-test | head -n 1 | cut -d ' ' -f 1`
-kill -0 $pid > /dev/null 2>&1
+PS_FLAGS=a; PS_PIDCOL=1
+ps a > /dev/null 2>&1
+if [ $? -ne 0 ]; then PS_FLAGS=-f; PS_PIDCOL=2; fi
 
-rm -rf logs
+ps $PS_FLAGS > procs.tmp
+pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$$PS_PIDCOL }"`
+kill -0 $pid > /dev/null 2>&1
 
 # -eof-