X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fwait-tests.sh;h=fb3be1858540f7ded7eaec20263e99256be37f30;hb=7ff16e81163b3bee43ce053cb86fb2df2a023d53;hp=70f669f474043c525d35dee7660f1d606a289982;hpb=7ec11de523b4e6dccaed45b0b5040886004f5dfb;p=ngircd-alex.git

diff --git a/src/testsuite/wait-tests.sh b/src/testsuite/wait-tests.sh
index 70f669f4..fb3be185 100755
--- a/src/testsuite/wait-tests.sh
+++ b/src/testsuite/wait-tests.sh
@@ -9,25 +9,35 @@
 # (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.5 2005/08/12 21:34:19 alex Exp $
 #
 
 [ "$1" -gt 0 ] 2> /dev/null && MAX="$1" || MAX=5
 
+# detect source directory
+[ -z "$srcdir" ] && srcdir=`dirname $0`
+
+PS_FLAGS="-f"
+ps $PS_FLAGS >/dev/null 2>&1
+[ $? -ne 0 ] && PS_FLAGS="a"
+
+# read in functions
+. ${srcdir}/functions.inc
+
 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
 
   if [ $msg -lt 1 ]; then
-    echo -n "      waiting for test scripts to settle: "
+    echo_n "      waiting for processes to settle: "
     msg=1
   fi
 
   # there are still clients connected. Wait ...
-  echo -n "$count>$MAX "
+  echo_n "$count>$MAX "
   sleep 1
 done