Test suite: clean up scripts

[ngircd.git] / src / testsuite / tests.sh

diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh
index bbb76add9e7f29f8ca918b64bf5bef6d8284ed5b..3e46c18706651a536ed8c202ff95f2ab06132d63 100755 (executable)
--- a/src/testsuite/tests.sh
+++ b/src/testsuite/tests.sh
@@ -1,32 +1,69 @@
 #!/bin/sh
+#
 # ngIRCd Test Suite
-# $Id: tests.sh,v 1.6 2004/09/04 19:14:46 alex Exp $
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
+#
 
 # 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`
-mkdir -p logs
+[ -d logs ] || mkdir logs
 
 if [ ! -r "$test" ]; then
-  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
 
-type expect > /dev/null 2>&1
+# read in functions
+. "${srcdir}/functions.inc"
+
+type expect >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-  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 "      ${name}: \"telnet\" not found.";  exit 77
+       echo "$test: \"telnet\" not found" >>tests-skipped.lst
+       echo "${name}: \"telnet\" not found."
+       exit 77
 fi
 
-echo -n "      running ${test} ..."
-expect ${srcdir}/${test}.e > logs/${test}.log 2>&1; r=$?
+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
+               ;;
+esac
+
+# prepare expect script
+e_in="${srcdir}/${test}.e"
+e_tmp="${test}.e_"
+e_exec="$e_in"
+if test -t 1 2>/dev/null; then
+       sed -e 's|^expect |puts -nonewline stderr "."; expect |g' \
+               "$e_in" >"$e_tmp"
+       [ $? -eq 0 ] && e_exec="$e_tmp"
+fi
+
+echo_n "running ${test} ..."
+expect "$e_exec" >logs/${test}.log; r=$?
 [ $r -eq 0 ] && echo " ok." || echo " failure!"
 
+rm -f "$e_tmp"
 exit $r
-
-# -eof-