X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fstress-server.sh;h=6a91d2ceecce22043abec9fabe285b00bc5d7b8f;hb=9ddb93478491336d531a1705a199c6e3cb27ca60;hp=23e684246f5d5cdc4d93e49e2f9174f81be944db;hpb=8d1efc81f686a9c9047d22897fbcc79a1666a7a6;p=ngircd-alex.git

diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh
index 23e68424..6a91d2ce 100755
--- a/src/testsuite/stress-server.sh
+++ b/src/testsuite/stress-server.sh
@@ -1,23 +1,46 @@
 #!/bin/sh
+#
 # ngIRCd Test Suite
-# $Id: stress-server.sh,v 1.5 2002/09/23 20:54:17 alex Exp $
+# Copyright (c)2002-2004 by Alexander Barton (alex@barton.de)
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
+#
+# $Id: stress-server.sh,v 1.9 2004/09/04 13:58:31 alex Exp $
+#
 
-CLIENTS=5
+# detect source directory
+[ -z "$srcdir" ] && srcdir=`dirname $0`
 
+# parse command line
+[ "$1" -gt 0 ] 2> /dev/null && CLIENTS="$1" || CLIENTS=5
+[ "$2" -gt 0 ] 2> /dev/null && LOOPS="$2" || LOOPS=1
+
+# get our name
 name=`basename $0`
-test=`echo ${name} | cut -d '.' -f 1`
+
+# create directories
 mkdir -p logs tests
 
+# test for required external tools
 type expect > /dev/null 2>&1
 if [ $? -ne 0 ]; then
-  echo "SKIP: ${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 "SKIP: ${name} -- \"telnet\" not found.";  exit 77
+  echo "      ${name}: \"telnet\" not found.";  exit 77
 fi
 
-echo "      stressing server with $CLIENTS clients (be patient!) ..."
+# hello world! :-)
+[ $LOOPS -gt 1 ] \
+  && echo "      stressing server with $CLIENTS clients in $LOOPS loops (be patient!):" \
+  || echo "      stressing server with $CLIENTS clients (be patient!):"
+
+# create scripts for expect(1)
 no=0
 while [ ${no} -lt $CLIENTS ]; do
   cat ${srcdir}/stress-A.e > tests/${no}.e
@@ -25,20 +48,43 @@ while [ ${no} -lt $CLIENTS ]; do
   cat ${srcdir}/stress-B.e >> tests/${no}.e
   no=`expr ${no} + 1`
 done
-no=0
-while [ ${no} -lt $CLIENTS ]; do
-  expect tests/${no}.e > logs/stress-${no}.log 2> /dev/null &
-  no=`expr ${no} + 1`
-done
 
-touch logs/check-idle.log
-while true; do
-  expect ${srcdir}/check-idle.e >> logs/check-idle.log
-  res=$?
-  [ $res -eq 0 ] && exit 0
-  [ $res -eq 1 ] && exit 1
-  sleep 1
-  echo "====================" >> logs/check-idle.log
+# main loop ...
+loop=0
+while [ ${loop} -lt $LOOPS ]; do
+  no=0
+  loop=`expr ${loop} + 1`
+  while [ ${no} -lt $CLIENTS ]; do
+    expect tests/${no}.e > logs/stress-${no}.log 2> /dev/null &
+    no=`expr ${no} + 1`
+  done
+  if [ $LOOPS -gt 1 ]; then
+    echo "      loop $loop/$LOOPS: started $no clients."
+    echo -n "      loop $loop/$LOOPS: waiting for clients to complete: "
+  else
+    echo "      started $no clients."
+    echo -n "      waiting for clients to complete: "
+  fi
+
+  res=3
+  touch logs/check-idle.log
+  while true; do
+    expect ${srcdir}/check-idle.e >> logs/check-idle.log; res=$?
+    echo "====================" >> logs/check-idle.log
+    [ $res -ne 99 ] && break
+
+    # there are still clients connected. Wait ...
+    sleep 1
+    echo -n "."
+  done
+
+  if [ $res -ne 0 ]; then
+    echo " ERROR!"
+    break
+  fi
+  echo " done."
 done
 
+exit $res
+
 # -eof-