#! /bin/sh
-# Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+# Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version
# 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`
-echo " scratchdir=$scratchdir"
+# Prefix for scratch directory. We create separate directories for
+# each test case, so that they can be left behind in case of failure
+# to aid investigation.
+scratchbase="`pwd`"/testtmp
+echo " scratchbase=$scratchbase"
suitedir="$srcdir/testsuite"
export scratchdir suitedir
+prep_scratch() {
+ [ -d "$scratchdir" ] && rm -rf "$scratchdir"
+ mkdir "$scratchdir"
+ return 0
+}
+
+discard_scratch() {
+ [ -d "$scratchdir" ] && rm -rf "$scratchdir"
+ return 0
+}
+
if [ "x$whichtests" = x ]
then
whichtests="*.test"
for testscript in $suitedir/$whichtests
do
- testbase=`echo $testscript | sed 's!.*/!!'`
+ testbase=`echo $testscript | sed 's!.*/!!' | sed -e 's/.test\$//'`
+ scratchdir="$scratchbase.$testbase"
- echo "----- $testbase starting"
+ prep_scratch
- if sh $RUNSHFLAGS "$testscript"
- then
- echo "----- $testbase completed succesfully"
+ set +e
+ sh $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1
+ result=$?
+ set -e
+
+ case $result in
+ 0)
+ echo "PASS $testbase"
passed=`expr $passed + 1`
- else
- case $? in
- 77)
- echo "----- $testbase skipped"
- skipped=`expr $skipped + 1`
- ;;
- *)
- echo "----- $testbase failed!"
- failed=`expr $failed + 1`
- if [ "x$nopersist" = "xyes" ]
- then
- exit 1
- fi
- esac
- fi
+ discard_scratch
+ ;;
+ 77)
+ echo "SKIP $testbase"
+ skipped=`expr $skipped + 1`
+ discard_scratch
+ ;;
+ 78)
+ # It failed, but we expected that. don't dump out error logs,
+ # because most users won't want to see them. But do leave
+ # the working directory around.
+ echo "XFAIL $testbase"
+ failed=`expr $failed + 1`
+ ;;
+ *)
+ echo "FAIL $testbase"
+ echo "----- $testbase failed: log follows"
+ cat "$scratchdir/test.log"
+ echo "----- $testbase log ends"
+ failed=`expr $failed + 1`
+ if [ "x$nopersist" = "xyes" ]
+ then
+ exit 1
+ fi
+ esac
done
echo '------------------------------------------------------------'