- Parameter fuer ps werden in anderer (besserer) Reihenfolge getestet.

diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 8b1550395b95839f4a6541efd57ccb81d88ce39e..8969dcddbc99097c21e8249f5ad05b63c12aeeee 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.5 2002/09/16 09:53:16 alex Exp $
+# $Id: start-server.sh,v 1.6 2002/09/18 20:58:56 alex Exp $
 
 echo "      starting server ..."
 
@@ -11,9 +11,9 @@ 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_FLAGS=a; PS_PIDCOL=1
-ps a > /dev/null 2>&1
-if [ $? -ne 0 ]; then PS_FLAGS=-f; PS_PIDCOL=2; fi
+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 }"`

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index af28bae1b567d40ad2073f23824f6b6b8dced88b..ee9d9dccfd9c3f319226f9153acb6146aa051b47 100755 (executable)
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.4 2002/09/16 09:53:16 alex Exp $
+# $Id: stop-server.sh,v 1.5 2002/09/18 20:58:56 alex Exp $
 
 echo "      stopping server ..."
 
-PS_FLAGS=a; PS_PIDCOL=1
-ps a > /dev/null 2>&1
-if [ $? -ne 0 ]; then PS_FLAGS=-f; PS_PIDCOL=2; fi
+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 }"`