X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6cd7888e46fb7611668c981ff8193c5f3d16d8a6..1db8b61de7fd31b9c7b02918e6c194255979f030:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 64ba3173..ab6f77a5 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -111,6 +111,13 @@
 # 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
 
@@ -153,16 +160,18 @@ missing=0
 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"
@@ -173,10 +182,11 @@ do
     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
@@ -185,7 +195,9 @@ do
 	    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
@@ -203,4 +215,11 @@ echo "      $passed passed"
 [ "$missing" -gt 0 ] && echo "      $missing missing"
 echo '------------------------------------------------------------'
 
-exit `expr $failed + $missing`
+# OK, so expr exits with 0 if the result is neither null nor zero; and
+# 1 if the expression is null or zero.  This is the opposite of what
+# we want, and if we just call expr then this script will always fail,
+# because -e is set.
+
+result=`expr $failed + $missing || true`
+echo "overall result is $result"
+exit $result