mirror of
				https://github.com/osmarks/ngircd.git
				synced 2025-10-31 05:52:59 +00:00 
			
		
		
		
	Made stress-server.sh to use wait-tests.sh to limit number of parallel tests.
This commit is contained in:
		| @@ -9,7 +9,7 @@ | |||||||
| # (at your option) any later version. | # (at your option) any later version. | ||||||
| # Please read the file COPYING, README and AUTHORS for more information. | # 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 $ | # $Id: stress-server.sh,v 1.11 2004/09/04 15:45:27 alex Exp $ | ||||||
| # | # | ||||||
|  |  | ||||||
| # detect source directory | # detect source directory | ||||||
| @@ -17,7 +17,7 @@ | |||||||
|  |  | ||||||
| # parse command line | # parse command line | ||||||
| [ "$1" -gt 0 ] 2> /dev/null && CLIENTS="$1" || CLIENTS=5 | [ "$1" -gt 0 ] 2> /dev/null && CLIENTS="$1" || CLIENTS=5 | ||||||
| [ "$2" -gt 0 ] 2> /dev/null && LOOPS="$2" || LOOPS=1 | [ "$2" -gt 0 ] 2> /dev/null && MAX="$2" || MAX=5 | ||||||
|  |  | ||||||
| # get our name | # get our name | ||||||
| name=`basename $0` | name=`basename $0` | ||||||
| @@ -36,9 +36,7 @@ if [ $? -ne 0 ]; then | |||||||
| fi | fi | ||||||
|  |  | ||||||
| # hello world! :-) | # hello world! :-) | ||||||
| [ $LOOPS -gt 1 ] \ | echo "      stressing server with $CLIENTS clients (be patient!):" | ||||||
|   && echo "      stressing server with $CLIENTS clients in $LOOPS loops (be patient!):" \ |  | ||||||
|   || echo "      stressing server with $CLIENTS clients (be patient!):" |  | ||||||
|  |  | ||||||
| # create scripts for expect(1) | # create scripts for expect(1) | ||||||
| no=0 | no=0 | ||||||
| @@ -49,24 +47,19 @@ while [ ${no} -lt $CLIENTS ]; do | |||||||
|   no=`expr ${no} + 1` |   no=`expr ${no} + 1` | ||||||
| done | done | ||||||
|  |  | ||||||
| # main loop ... |  | ||||||
| loop=0 |  | ||||||
| while [ ${loop} -lt $LOOPS ]; do |  | ||||||
| no=0 | no=0 | ||||||
|   loop=`expr ${loop} + 1` |  | ||||||
| while [ ${no} -lt $CLIENTS ]; do | while [ ${no} -lt $CLIENTS ]; do | ||||||
|   expect tests/${no}.e > logs/stress-${no}.log 2> /dev/null & |   expect tests/${no}.e > logs/stress-${no}.log 2> /dev/null & | ||||||
|   no=`expr ${no} + 1` |   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 |   count=`ps | grep "expect " | wc -l` | ||||||
|  |   count=`expr $count - 1` | ||||||
|  |   echo "      started client $no/$CLIENTS ($count test scripts running)." | ||||||
|  |  | ||||||
|  |   $srcdir/wait-tests.sh $MAX | ||||||
|  | done | ||||||
|  |  | ||||||
|  | echo -n "      waiting for clients to complete: ." | ||||||
| touch logs/check-idle.log | touch logs/check-idle.log | ||||||
| while true; do | while true; do | ||||||
|   expect ${srcdir}/check-idle.e >> logs/check-idle.log; res=$? |   expect ${srcdir}/check-idle.e >> logs/check-idle.log; res=$? | ||||||
| @@ -78,12 +71,7 @@ while [ ${loop} -lt $LOOPS ]; do | |||||||
|   echo -n "." |   echo -n "." | ||||||
| done | done | ||||||
|  |  | ||||||
|   if [ $res -ne 0 ]; then | [ $res -eq 0 ] && echo " done." || echo " ERROR!" | ||||||
|     echo " ERROR!" |  | ||||||
|     break |  | ||||||
|   fi |  | ||||||
|   echo " done." |  | ||||||
| done |  | ||||||
|  |  | ||||||
| exit $res | exit $res | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Alexander Barton
					Alexander Barton