From 8bede388af99cee1b0b32c108ca4704548c0b790 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Mon, 24 Sep 2012 22:25:58 +0200
Subject: [PATCH] Test suite: remove indentation of messages
---
src/testsuite/start-server.sh | 2 +-
src/testsuite/stop-server.sh | 2 +-
src/testsuite/stress-server.sh | 12 ++++++------
src/testsuite/tests.sh | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 90832a39..0fd61ea9 100755
--- a/src/testsuite/start-server.sh
+++ b/src/testsuite/start-server.sh
@@ -12,7 +12,7 @@ else
id="1"
fi
-echo_n " starting server ${id} ..."
+echo_n "starting server ${id} ..."
# remove old logfiles, if this is the first server (ID 1)
[ "$id" = "1" ] && rm -rf logs *.log
diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index 7e6ee4f7..c531137e 100755
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -12,7 +12,7 @@ else
id="1"
fi
-echo_n " stopping server ${id} ..."
+echo_n "stopping server ${id} ..."
# stop test-server ...
pid=`./getpid.sh T-ngircd${id}`
diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh
index 15d6df1f..1e823253 100755
--- a/src/testsuite/stress-server.sh
+++ b/src/testsuite/stress-server.sh
@@ -27,15 +27,15 @@ name=`basename $0`
# 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
@@ -50,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!"
@@ -64,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=$?
diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh
index dc184ffc..f820628f 100755
--- a/src/testsuite/tests.sh
+++ b/src/testsuite/tests.sh
@@ -18,7 +18,7 @@ test=`echo ${name} | cut -d '.' -f 1`
[ -d logs ] || mkdir logs
if [ ! -r "$test" ]; then
- echo " ${name}: test \"$test\" not found!"; exit 77
+ echo "${name}: test \"$test\" not found!"; exit 77
exit 1
fi
@@ -27,14 +27,14 @@ fi
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
-echo_n " running ${test} ..."
+echo_n "running ${test} ..."
expect ${srcdir}/${test}.e > logs/${test}.log 2>&1; r=$?
[ $r -eq 0 ] && echo " ok." || echo " failure!"