X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Ftests.sh;h=2bd9ae402125adb05db0e5e0adf27e2e6712b8ec;hb=1a5ed654b43b7d4b14636fddd4ee79d3ebe749fa;hp=401a55da8b057cd975acab61c73a2dbe99cfeae3;hpb=1ed708ef39f41436797754829fd574f34f8a3a71;p=ngircd-alex.git

diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh
index 401a55da..2bd9ae40 100755
--- a/src/testsuite/tests.sh
+++ b/src/testsuite/tests.sh
@@ -1,11 +1,22 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: tests.sh,v 1.4 2003/08/22 11:31:18 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 "      ${name}: \"expect\" not found.";  exit 77
@@ -15,7 +26,10 @@ if [ $? -ne 0 ]; then
   echo "      ${name}: \"telnet\" not found.";  exit 77
 fi
 
-echo "      doing ${test} ..."
-expect ${srcdir}/${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-