Test suite: clean up scripts

[ngircd.git] / src / testsuite / wait-tests.sh

diff --git a/src/testsuite/wait-tests.sh b/src/testsuite/wait-tests.sh
index 70f669f474043c525d35dee7660f1d606a289982..b6fa08f5b7d8e5f5e00d89fb57a7ae7837f9e7aa 100755 (executable)
--- a/src/testsuite/wait-tests.sh
+++ b/src/testsuite/wait-tests.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # ngIRCd Test Suite
-# Copyright (c)2002-2004 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,29 +9,36 @@
 # (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 $
-#
 
-[ "$1" -gt 0 ] 2> /dev/null && MAX="$1" || MAX=5
+[ "$1" -gt 0 ] 2>/dev/null && MAX="$1" || MAX=5
+
+# detect source directory
+[ -z "$srcdir" ] && srcdir=`dirname "$0"`
+set -u
+
+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=`expr $count - 1`
+       count=`ps $PS_FLAGS | grep "expect " | wc -l`
+       count=`expr $count - 1`
 
-  [ $count -le $MAX ] && break
+       [ $count -le $MAX ] && break
 
-  if [ $msg -lt 1 ]; then
-    echo -n "      waiting for test scripts to settle: "
-    msg=1
-  fi
+       if [ $msg -lt 1 ]; then
+               echo_n "      waiting for processes to settle: "
+               msg=1
+       fi
 
-  # there are still clients connected. Wait ...
-  echo -n "$count>$MAX "
-  sleep 1
+       # there are still clients connected. Wait ...
+       echo_n "$count>$MAX "
+       sleep 1
 done
 
 [ $msg -gt 0 ] && echo "done: $count"
 exit 0
-
-# -eof-