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

diff --git a/runtests.sh b/runtests.sh
index 8c3222f7..ab6f77a5 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -160,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"
@@ -180,8 +182,9 @@ 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 successfully"
 	passed=`expr $passed + 1`
@@ -192,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