From: Alexander Barton <alex@barton.de>
Date: Wed, 18 Sep 2002 20:58:56 +0000 (+0000)
Subject: - Parameter fuer ps werden in anderer (besserer) Reihenfolge getestet.
X-Git-Tag: rel-0-6-0-pre1~221
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=b5d6597c0ab0c7aa2ada7a9083cbc49f5c92e286

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

diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 8b155039..8969dcdd 100755
--- 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 af28bae1..ee9d9dcc 100755
--- 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 }"`