X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fstress-server.sh;h=1e823253cd3a0c093ee88f65e8d3c61bab9ef8a6;hb=456eea6f1896528dad344ed2c254fd07bdc3a4b1;hp=0f85958e98c3acce91ebe67899fe319aea33f02b;hpb=fb9707de98d1b15779779c55e266b92508d7e26c;p=ngircd-alex.git diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh index 0f85958e..1e823253 100755 --- a/src/testsuite/stress-server.sh +++ b/src/testsuite/stress-server.sh @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd Test Suite -# Copyright (c)2002-2004 by Alexander Barton (alex@barton.de) +# Copyright (c)2001-2012 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,8 +9,6 @@ # (at your option) any later version. # Please read the file COPYING, README and AUTHORS for more information. # -# $Id: stress-server.sh,v 1.16 2005/12/30 22:13:21 alex Exp $ -# # detect source directory [ -z "$srcdir" ] && srcdir=`dirname $0` @@ -23,20 +21,21 @@ name=`basename $0` # create directories -mkdir -p logs tests +[ -d logs ] || mkdir logs +[ -d tests ] || mkdir tests # test for required external tools type expect > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ${name}: \"expect\" not found."; exit 77 + echo "${name}: \"expect\" not found."; exit 77 fi type telnet > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ${name}: \"telnet\" not found."; exit 77 + echo "${name}: \"telnet\" not found."; exit 77 fi # hello world! :-) -echo " stressing server with $CLIENTS clients (be patient!):" +echo "stressing server with $CLIENTS clients (be patient!):" # read in functions . ${srcdir}/functions.inc @@ -51,7 +50,7 @@ while [ ${no} -lt $CLIENTS ]; do done # run first script and check if it succeeds -echo_n " checking stress script ..." +echo_n "checking stress script ..." expect tests/0.e > logs/stress-0.log 2> /dev/null if [ $? -ne 0 ]; then echo " failure!" @@ -65,12 +64,12 @@ while [ ${no} -lt $CLIENTS ]; do expect tests/${no}.e > logs/stress-${no}.log 2> /dev/null & no=`expr ${no} + 1` - echo " started client $no/$CLIENTS." + echo "started client $no/$CLIENTS." [ $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=$?