X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fstress-server.sh;h=306433b036897d7d78aeebe0581b2982f98306a9;hb=ceafdf109b724d1c5640a3f437c2ef6c7492289b;hp=43305d0d7a47000327a51be9a239a9478ec72c64;hpb=f7a4d03ba2701bc91d48a70be66871ba435334ae;p=ngircd-alex.git diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh index 43305d0d..306433b0 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.12 2004/09/04 16:14:47 alex Exp $ +# $Id: stress-server.sh,v 1.15 2004/09/06 22:04:06 alex Exp $ # # detect source directory @@ -17,7 +17,7 @@ # parse command line [ "$1" -gt 0 ] 2> /dev/null && CLIENTS="$1" || CLIENTS=5 -[ "$2" -gt 0 ] 2> /dev/null && MAX="$2" || MAX=5 +[ "$2" -gt 0 ] 2> /dev/null && MAX="$2" || MAX=-1 # get our name name=`basename $0` @@ -38,6 +38,9 @@ fi # hello world! :-) echo " stressing server with $CLIENTS clients (be patient!):" +# read in functions +. ${srcdir}/functions.inc + # create scripts for expect(1) no=0 while [ ${no} -lt $CLIENTS ]; do @@ -47,23 +50,17 @@ 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 $PS_FLAGS | grep "expect " | wc -l` - count=`expr $count - 1` - echo " started client $no/$CLIENTS ($count test scripts running)." + no=`expr ${no} + 1` + echo " started client $no/$CLIENTS." - $srcdir/wait-tests.sh $MAX + [ $MAX -gt 0 ] && $srcdir/wait-tests.sh $MAX done -echo -n " waiting for clients to complete: ." +echo_n " waiting for clients to complete: ." touch logs/check-idle.log while true; do expect ${srcdir}/check-idle.e >> logs/check-idle.log; res=$? @@ -72,10 +69,10 @@ while true; do # there are still clients connected. Wait ... sleep 3 - echo -n "." + echo_n "." done -[ $res -eq 0 ] && echo " done." || echo " ERROR!" +[ $res -eq 0 ] && echo " ok." || echo " failure!" exit $res