X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Ftestsuite%2Fstress-server.sh;h=1e823253cd3a0c093ee88f65e8d3c61bab9ef8a6;hp=4f94809a6e84fb5952de91474cccbf2ffb0ea9a6;hb=HEAD;hpb=18eb92a72b7e41f9f082740d1a9328543f8c172f

diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh
index 4f94809a..a9ef5076 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-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,82 +9,80 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: stress-server.sh,v 1.10 2004/09/04 14:23:09 alex Exp $
-#
-
-# 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
+[ "$1" -gt 0 ] 2>/dev/null && CLIENTS="$1" || CLIENTS=5
+[ "$2" -gt 0 ] 2>/dev/null && MAX="$2" || MAX=-1
+
+# detect source directory
+[ -z "$srcdir" ] && srcdir=`dirname "$0"`
+set -u
 
 # get our name
-name=`basename $0`
+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
+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
+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! :-)
-[ $LOOPS -gt 1 ] \
-  && echo "      stressing server with $CLIENTS clients in $LOOPS loops (be patient!):" \
-  || echo "      stressing server with $CLIENTS clients (be patient!):"
+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
-  cat ${srcdir}/stress-A.e > tests/${no}.e
-  echo "send \"nick test${no}\\r\"" >> tests/${no}.e
-  cat ${srcdir}/stress-B.e >> tests/${no}.e
-  no=`expr ${no} + 1`
+	cat "${srcdir}/stress-A.e" >tests/${no}.e
+	echo "send \"nick test${no}\\r\"" >>tests/${no}.e
+	cat "${srcdir}/stress-B.e" >>tests/${no}.e
+	no=`expr ${no} + 1`
 done
 
-# 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
+# run first script and check if it succeeds
+echo_n "checking stress script ..."
+expect tests/0.e >logs/stress-0.log 2>/dev/null
+if [ $? -ne 0 ]; then
+	echo " failure!"
+	exit 1
+else
+	echo " ok."
+fi
+
+no=0
+while [ ${no} -lt $CLIENTS ]; do
+	expect tests/${no}.e >logs/stress-${no}.log 2>/dev/null &
 
-  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
+	no=`expr ${no} + 1`
+	echo "started client $no/$CLIENTS."
 
-    # there are still clients connected. Wait ...
-    sleep 3
-    echo -n "."
-  done
+	[ $MAX -gt 0 ] && "$srcdir/wait-tests.sh" $MAX
+done
+
+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=$?
+	echo "====================" >>logs/check-idle.log
+	[ $res -ne 99 ] && break
 
-  if [ $res -ne 0 ]; then
-    echo " ERROR!"
-    break
-  fi
-  echo " done."
+	# there are still clients connected. Wait ...
+	sleep 3
+	echo_n "."
 done
 
+[ $res -eq 0 ] && echo " ok." || echo " failure!"
 exit $res
-
-# -eof-