# Perhaps we need a common way to cleanup tests. At the moment just
# clobbering the directory when we're done should be enough.
+# If any of the targets fail, then (GNU?) Make returns 2, instead of
+# the return code from the failing command. This is fine, but it
+# means that the build farm just shows "2" for failed tests, not the
+# number of tests that actually failed. For more details we might
+# need to grovel through the log files to find a line saying how many
+# failed.
+
set -e
passed=0
failed=0
-scratchdir=./testtmp
-[ -d "$scratchdir" ] && rm -r "$scratchdir"
-mkdir "$scratchdir"
-scratchdir=`cd $scratchdir && pwd`
+scratchdir="`pwd`"/testtmp
echo " scratchdir=$scratchdir"
suitedir="$srcdir/testsuite"
export scratchdir suitedir
+clean_scratch() {
+ [ -d "$scratchdir" ] && rm -rf "$scratchdir"
+ mkdir "$scratchdir"
+}
+
if [ "x$whichtests" = x ]
then
whichtests="*.test"
testbase=`echo $testscript | sed 's!.*/!!'`
echo "----- $testbase starting"
+ clean_scratch
- if sh $RUNSHFLAGS "$testscript"
+ if sh $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1
then
- echo "----- $testbase completed succesfully"
+ echo "----- $testbase completed successfully"
passed=`expr $passed + 1`
else
case $? in
skipped=`expr $skipped + 1`
;;
*)
- echo "----- $testbase failed!"
+ echo "----- $testbase failed: log follows"
+ cat "$scratchdir/test.log"
+ echo "----- $testbase log ends"
failed=`expr $failed + 1`
if [ "x$nopersist" = "xyes" ]
then