Fixes to who-test: accept any ident, escape some '*' flags.

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

diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh
index e2ddd930b78a2ec5a857dd45040b87104cd782f5..2bd9ae402125adb05db0e5e0adf27e2e6712b8ec 100755 (executable)
--- a/src/testsuite/tests.sh
+++ b/src/testsuite/tests.sh
@@ -1,21 +1,35 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: tests.sh,v 1.2 2002/09/09 22:56:07 alex Exp $
+# $Id: tests.sh,v 1.7 2004/09/06 22:04:06 alex Exp $
+
+# detect source directory
+[ -z "$srcdir" ] && srcdir=`dirname $0`
 
 name=`basename $0`
 test=`echo ${name} | cut -d '.' -f 1`
 mkdir -p logs
 
+if [ ! -r "$test" ]; then
+  echo "      ${name}: test \"$test\" not found!";  exit 77
+  exit 1
+fi
+
+# read in functions
+. ${srcdir}/functions.inc
+
 type expect > /dev/null 2>&1
 if [ $? -ne 0 ]; then
-  echo "SKIP: ${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 "SKIP: ${name} -- \"telnet\" not found.";  exit 77
+  echo "      ${name}: \"telnet\" not found.";  exit 77
 fi
 
-echo "      doing ${test} ..."
-expect ${test}.e > logs/${test}.log
+echo_n "      running ${test} ..."
+expect ${srcdir}/${test}.e > logs/${test}.log 2>&1; r=$?
+[ $r -eq 0 ] && echo " ok." || echo " failure!"
+
+exit $r
 
 # -eof-