albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test suite: remove indentation of messages

This commit is contained in:
Alexander Barton 2012-09-24 22:25:58 +02:00
parent c9d166747d
commit 8bede388af
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testsuite/start-server.sh
View File

@ -12,7 +12,7 @@ else
id="1" id="1"
fi fi
echo_n " starting server ${id} ..." echo_n "starting server ${id} ..."
# remove old logfiles, if this is the first server (ID 1) # remove old logfiles, if this is the first server (ID 1)
[ "$id" = "1" ] && rm -rf logs *.log [ "$id" = "1" ] && rm -rf logs *.log

2
src/testsuite/stop-server.sh
View File

@ -12,7 +12,7 @@ else
id="1" id="1"
fi fi
echo_n " stopping server ${id} ..." echo_n "stopping server ${id} ..."
# stop test-server ... # stop test-server ...
pid=`./getpid.sh T-ngircd${id}` pid=`./getpid.sh T-ngircd${id}`

12
src/testsuite/stress-server.sh
View File

@ -27,15 +27,15 @@ name=`basename $0`
# test for required external tools # test for required external tools
type expect > /dev/null 2>&1 type expect > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo " ${name}: \"expect\" not found."; exit 77 echo "${name}: \"expect\" not found."; exit 77
fi fi
type telnet > /dev/null 2>&1 type telnet > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo " ${name}: \"telnet\" not found."; exit 77 echo "${name}: \"telnet\" not found."; exit 77
fi fi
# hello world! :-) # hello world! :-)
echo " stressing server with $CLIENTS clients (be patient!):" echo "stressing server with $CLIENTS clients (be patient!):"
# read in functions # read in functions
. ${srcdir}/functions.inc . ${srcdir}/functions.inc
@ -50,7 +50,7 @@ while [ ${no} -lt $CLIENTS ]; do
done done
# run first script and check if it succeeds # 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 expect tests/0.e > logs/stress-0.log 2> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo " failure!" echo " failure!"
@ -64,12 +64,12 @@ 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`
echo " started client $no/$CLIENTS." echo "started client $no/$CLIENTS."
[ $MAX -gt 0 ] && $srcdir/wait-tests.sh $MAX [ $MAX -gt 0 ] && $srcdir/wait-tests.sh $MAX
done done
echo_n " waiting for clients to complete: ." 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=$?

8
src/testsuite/tests.sh
View File

@ -18,7 +18,7 @@ test=`echo ${name} | cut -d '.' -f 1`
[ -d logs ] || mkdir logs [ -d logs ] || mkdir logs
if [ ! -r "$test" ]; then if [ ! -r "$test" ]; then
echo " ${name}: test \"$test\" not found!"; exit 77 echo "${name}: test \"$test\" not found!"; exit 77
exit 1 exit 1
fi fi
@ -27,14 +27,14 @@ fi
type expect > /dev/null 2>&1 type expect > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo " ${name}: \"expect\" not found."; exit 77 echo "${name}: \"expect\" not found."; exit 77
fi fi
type telnet > /dev/null 2>&1 type telnet > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo " ${name}: \"telnet\" not found."; exit 77 echo "${name}: \"telnet\" not found."; exit 77
fi fi
echo_n " running ${test} ..." echo_n "running ${test} ..."
expect ${srcdir}/${test}.e > logs/${test}.log 2>&1; r=$? expect ${srcdir}/${test}.e > logs/${test}.log 2>&1; r=$?
[ $r -eq 0 ] && echo " ok." || echo " failure!" [ $r -eq 0 ] && echo " ok." || echo " failure!"