X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d286ee98b915721150ba20e4a954f83fbc6df30f..eecd22ff7b041c6dc3cd5ff517aef64d2b69607c:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 1026d053..5c672dd2 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -62,13 +62,17 @@
 
 # Each test case runs in its own shell. 
 
-# Exit codes: (passed back to build farm):
+# Exit codes from tests:
 
 #    1  tests failed
 #    2  error in starting tests
 #   77  this test skipped (random value unlikely to happen by chance, same as
 #       automake)
 
+# HOWEVER, the overall exit code to the farm is different: we return
+# the *number of tests that failed*, so that it will show up nicely in
+# the overall summary.
+
 # rsync.fns contains some general setup functions and definitions.
 
 
@@ -97,8 +101,11 @@ RUNSHFLAGS='-e'
 
 if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
 then
-    RUNSHFLAGS="$RUNSHFLAGS -x"
-    set -x
+    if set -x
+    then
+	# If it doesn't work the first time, don't keep trying.
+	RUNSHFLAGS="$RUNSHFLAGS -x"
+    fi
 fi
 
 echo "============================================================"
@@ -106,20 +113,21 @@ echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 
-if ! test -f $rsync_bin
+if test ! -f $rsync_bin
 then
     echo "rsync_bin $rsync_bin is not a file" >&2
     exit 2
 fi
 
-if ! test -d $srcdir
+if test ! -d $srcdir
 then
     echo "srcdir $srcdir is not a directory" >&2
     exit 2
 fi
 
+RSYNC="$rsync_bin"
 
-export rsync_bin
+export rsync_bin RSYNC
 
 skipped=0
 missing=0
@@ -129,24 +137,18 @@ failed=0
 scratchdir=./testtmp
 [ -d "$scratchdir" ] && rm -r "$scratchdir"
 mkdir "$scratchdir"
-
+scratchdir=`cd $scratchdir && pwd`
 echo "    scratchdir=$scratchdir"
+
 suitedir="$srcdir/testsuite"
 
 export scratchdir suitedir
 
-for testbase in rsync-hello hands ssh-basic
+for testscript in $suitedir/*.test
 do
-    testscript="$suitedir/$testbase.test"
-    if test \! -f "$testscript" 
-    then
-	echo "$testscript does not exist" >&2
-	missing=`expr $missing + 1`
-	continue
-    fi
+    testbase=`echo $testscript | sed 's!.*/!!'`
 
-    echo "------------------------------------------------------------"
-    echo "----- $testbase running"
+    echo "----- $testbase starting"
 
     if sh $RUNSHFLAGS "$testscript"
     then
@@ -161,6 +163,10 @@ do
 	*)
 	    echo "----- $testbase failed!"
 	    failed=`expr $failed + 1`
+	    if [ "x$nopersist" = "xyes" ]
+	    then
+		exit 1
+	    fi
 	esac
     fi
 done
@@ -173,9 +179,4 @@ echo "      $skipped skipped"
 echo "      $missing missing"
 echo '------------------------------------------------------------'
 
-if test "$failed" -gt 0 || test "$missing" -gt 0
-then
-    exit 1
-else
-    exit 0
-fi
+exit `expr $failed + $missing`