Split out generic functions for starting rsyncd.

[rsync/rsync.git] / runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 8d5bde7..5c672dd 100755 (executable)
--- 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,13 +113,13 @@ 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
@@ -137,18 +144,11 @@ 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
@@ -163,7 +163,10 @@ do
        *)
            echo "----- $testbase failed!"
            failed=`expr $failed + 1`
-           [ "$nopersist" = "yes" ] && exit 1
+           if [ "x$nopersist" = "xyes" ]
+           then
+               exit 1
+           fi
        esac
     fi
 done
@@ -176,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`