From: Alexander Barton <alex@barton.de>
Date: Sat, 4 Sep 2004 16:14:47 +0000 (+0000)
Subject: Added detection of flags for ps(1).
X-Git-Tag: rel-0-9-0-pre1~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7a4d03ba2701bc91d48a70be66871ba435334ae;p=ngircd

Added detection of flags for ps(1).
---

diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh
index bf7ed00f..43305d0d 100755
--- a/src/testsuite/stress-server.sh
+++ b/src/testsuite/stress-server.sh
@@ -9,7 +9,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: stress-server.sh,v 1.11 2004/09/04 15:45:27 alex Exp $
+# $Id: stress-server.sh,v 1.12 2004/09/04 16:14:47 alex Exp $
 #
 
 # detect source directory
@@ -47,12 +47,16 @@ while [ ${no} -lt $CLIENTS ]; do
   no=`expr ${no} + 1`
 done
 
+PS_FLAGS="-f"
+ps $PS_FLAGS >/dev/null 2>&1
+[ $? -ne 0 ] && PS_FLAGS="a"
+
 no=0
 while [ ${no} -lt $CLIENTS ]; do
   expect tests/${no}.e > logs/stress-${no}.log 2> /dev/null &
   no=`expr ${no} + 1`
 
-  count=`ps | grep "expect " | wc -l`
+  count=`ps $PS_FLAGS | grep "expect " | wc -l`
   count=`expr $count - 1`
   echo "      started client $no/$CLIENTS ($count test scripts running)."
 
diff --git a/src/testsuite/wait-tests.sh b/src/testsuite/wait-tests.sh
index 70f669f4..52458be9 100755
--- a/src/testsuite/wait-tests.sh
+++ b/src/testsuite/wait-tests.sh
@@ -9,14 +9,18 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: wait-tests.sh,v 1.1 2004/09/04 15:44:45 alex Exp $
+# $Id: wait-tests.sh,v 1.2 2004/09/04 16:14:47 alex Exp $
 #
 
 [ "$1" -gt 0 ] 2> /dev/null && MAX="$1" || MAX=5
 
+PS_FLAGS="-f"
+ps $PS_FLAGS >/dev/null 2>&1
+[ $? -ne 0 ] && PS_FLAGS="a"
+
 msg=0
 while true; do
-  count=`ps | grep "expect " | wc -l`
+  count=`ps $PS_FLAGS | grep "expect " | wc -l`
   count=`expr $count - 1`
 
   [ $count -le $MAX ] && break