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

diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 9413ba569060ecd106854ff9bc5d7c38bda6e284..8b1550395b95839f4a6541efd57ccb81d88ce39e 100755 (executable)
--- a/src/testsuite/start-server.sh
+++ b/src/testsuite/start-server.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: start-server.sh,v 1.4 2002/09/13 06:04:49 alex Exp $
+# $Id: start-server.sh,v 1.5 2002/09/16 09:53:16 alex Exp $
 
 echo "      starting server ..."
 
@@ -11,8 +11,12 @@ echo "This is an ngIRCd Test Server" > ngircd-test.motd
 ./ngircd-TEST -np -f ${srcdir}/ngircd-test.conf > ngircd-test.log 2>&1 &
 sleep 1
 
-ps ax > procs.tmp
-pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$1 }"`
+PS_FLAGS=a; PS_PIDCOL=1
+ps a > /dev/null 2>&1
+if [ $? -ne 0 ]; then PS_FLAGS=-f; PS_PIDCOL=2; fi
+
+ps $PS_FLAGS > procs.tmp
+pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$$PS_PIDCOL }"`
 kill -0 $pid > /dev/null 2>&1
 
 # -eof-

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index b649c9c9d0ec5ff1d2f07af17b3aaec1d93b20c1..af28bae1b567d40ad2073f23824f6b6b8dced88b 100755 (executable)
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,11 +1,15 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.3 2002/09/13 06:04:49 alex Exp $
+# $Id: stop-server.sh,v 1.4 2002/09/16 09:53:16 alex Exp $
 
 echo "      stopping server ..."
 
-ps ax > procs.tmp
-pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$1 }"`
+PS_FLAGS=a; PS_PIDCOL=1
+ps a > /dev/null 2>&1
+if [ $? -ne 0 ]; then PS_FLAGS=-f; PS_PIDCOL=2; fi
+
+ps $PS_FLAGS > procs.tmp
+pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$$PS_PIDCOL }"`
 kill $pid > /dev/null 2>&1
 
 # -eof-