X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7d29902a6a7d9cea7c8a524478bb70062100d34..78ffe4787fbe6c3d175d9196ef4c2bc9f4521b5f:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 2f67d456..8d5bde76 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -52,19 +52,54 @@
 # A scratch directory, 'testtmp', is created in the build directory to
 # hold working files.
 
-# Both this script and the Makefile have to be pretty conservative
-# about which Unix features they use.  
+# This script also uses the $loglevel environment variable.  1 is the
+# default value, and 10 the most verbose.  You can set this from the
+# Make command line.  It's also set by the build farm to give more
+# detail for failing builds.
+
+
+# NOTES FOR TEST CASES:
+
+# Each test case runs in its own shell. 
 
 # Exit codes: (passed back to build farm):
 
 #    1  tests failed
 #    2  error in starting tests
+#   77  this test skipped (random value unlikely to happen by chance, same as
+#       automake)
+
+# rsync.fns contains some general setup functions and definitions.
+
+
+# NOTES ON PORTABILITY:
+
+# Both this script and the Makefile have to be pretty conservative
+# about which Unix features they use.
+
+# We cannot count on Make exporting variables to commands, unless
+# they're explicitly given on the command line.
+
+# Also, we can't count on 'cp -a' or 'mkdir -p', although they're
+# pretty handy.
+
+# I think some of the GNU documentation suggests that we shouldn't
+# rely on shell functions.  However, the Bash manual seems to say that
+# they're in POSIX 1003.2, and since the build farm relies on them
+# they're probably working on most machines we really care about.
 
 
 set -e
 
 . "./shconfig"
 
+RUNSHFLAGS='-e'
+
+if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
+then
+    RUNSHFLAGS="$RUNSHFLAGS -x"
+    set -x
+fi
 
 echo "============================================================"
 echo "$0 running in `pwd`"
@@ -83,8 +118,9 @@ then
     exit 2
 fi
 
+RSYNC="$rsync_bin"
 
-export rsync_bin
+export rsync_bin RSYNC
 
 skipped=0
 missing=0
@@ -94,11 +130,14 @@ failed=0
 scratchdir=./testtmp
 [ -d "$scratchdir" ] && rm -r "$scratchdir"
 mkdir "$scratchdir"
-
+scratchdir=`cd $scratchdir && pwd`
 echo "    scratchdir=$scratchdir"
+
 suitedir="$srcdir/testsuite"
 
-for testbase in rsync-hello hands
+export scratchdir suitedir
+
+for testbase in rsync-hello hands ssh-basic
 do
     testscript="$suitedir/$testbase.test"
     if test \! -f "$testscript" 
@@ -111,14 +150,22 @@ do
     echo "------------------------------------------------------------"
     echo "----- $testbase running"
 
-    if sh "$testscript"
+    if sh $RUNSHFLAGS "$testscript"
     then
 	echo "----- $testbase completed succesfully"
 	passed=`expr $passed + 1`
-    else
-	echo "----- $testbase failed!"
-	failed=`expr $failed + 1`
-    fi	
+    else 
+	case $? in
+	77)
+	    echo "----- $testbase skipped"
+	    skipped=`expr $skipped + 1`
+	    ;;
+	*)
+	    echo "----- $testbase failed!"
+	    failed=`expr $failed + 1`
+	    [ "$nopersist" = "yes" ] && exit 1
+	esac
+    fi
 done
 
 echo '------------------------------------------------------------'
@@ -129,7 +176,7 @@ echo "      $skipped skipped"
 echo "      $missing missing"
 echo '------------------------------------------------------------'
 
-if test $failed -gt 0
+if test "$failed" -gt 0 || test "$missing" -gt 0
 then
     exit 1
 else