From cf20b16d2aa3926d598c61e919083264cac1c12c Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Fri, 20 Sep 2002 13:46:22 +0000 Subject: [PATCH] - Flags bei "ps" werden in anderer Reihenfolge geprueft (aus CVS-HEAD). --- src/testsuite/start-server.sh | 8 ++++---- src/testsuite/stop-server.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh index 8b155039..3c9f1bcc 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.5.2.1 2002/09/20 13:46:22 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..e9acbb31 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.4.2.1 2002/09/20 13:46:22 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 }"` -- 2.39.2