Test suite: clean up scripts

- Reformat code.
- Cleanup some glitches, streamline scripts ...
- Enable "set -u": Error on unset variables.
- Detect "$srcdir" in prep-server3 script, too.

1 files changed, 24 insertions, 22 deletions

diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh
index 7af8c593..3e46c187 100755
--- a/src/testsuite/tests.sh
+++ b/src/testsuite/tests.sh
@@ -11,40 +11,44 @@
 #
 
 # detect source directory
-[ -z "$srcdir" ] && srcdir=`dirname $0`
+[ -z "$srcdir" ] && srcdir=`dirname "$0"`
+set -u
 
-name=`basename $0`
+name=`basename "$0"`
 test=`echo ${name} | cut -d '.' -f 1`
 [ -d logs ] || mkdir logs
 
 if [ ! -r "$test" ]; then
-  echo "$test: test not found" >>tests-skipped.lst
-  echo "${name}: test \"$test\" not found!";  exit 77
-  exit 1
+	echo "$test: test not found" >>tests-skipped.lst
+	echo "${name}: test \"$test\" not found!";  exit 77
+	exit 1
 fi
 
 # read in functions
-. ${srcdir}/functions.inc
+. "${srcdir}/functions.inc"
 
-type expect > /dev/null 2>&1
+type expect >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-  echo "$test: \"expect\" not found" >>tests-skipped.lst
-  echo "${name}: \"expect\" not found.";  exit 77
+	echo "$test: \"expect\" not found" >>tests-skipped.lst
+	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 "$test: \"telnet\" not found" >>tests-skipped.lst
-  echo "${name}: \"telnet\" not found.";  exit 77
+	echo "$test: \"telnet\" not found" >>tests-skipped.lst
+	echo "${name}: \"telnet\" not found."
+	exit 77
 fi
 
 case "$test" in
-  *ssl*)
-    type openssl > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-      echo "$test: \"openssl\" not found" >>tests-skipped.lst
-      echo "${name}: \"openssl\" not found.";  exit 77
-    fi
-    ;;
+	*ssl*)
+		type openssl >/dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			echo "$test: \"openssl\" not found" >>tests-skipped.lst
+			echo "${name}: \"openssl\" not found."
+			exit 77
+		fi
+		;;
 esac
 
 # prepare expect script
@@ -58,10 +62,8 @@ if test -t 1 2>/dev/null; then
 fi
 
 echo_n "running ${test} ..."
-expect "$e_exec" > logs/${test}.log; r=$?
+expect "$e_exec" >logs/${test}.log; r=$?
 [ $r -eq 0 ] && echo " ok." || echo " failure!"
 
 rm -f "$e_tmp"
 exit $r
-
-# -eof-