Split code out into separate files and remove some global variables to

[rsync/rsync.git] / runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 5d3af1b..d2865ae 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -125,6 +125,9 @@ set -e
 
 RUNSHFLAGS='-e'
 
+# for Solaris
+PATH="/usr/xpg4/bin/:$PATH"
+
 if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
 then
     if set -x
@@ -139,6 +142,20 @@ echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 
+testuser=`whoami || echo UNKNOWN`
+
+echo "    testuser=$testuser"
+echo "    os=`uname -a`"
+
+# It must be "yes", not just nonnull
+if test "x$preserve_scratch" = xyes
+then
+    echo "    preserve_scratch=yes"
+else
+    echo "    preserve_scratch=no"
+fi    
+
+
 if test ! -f $rsync_bin
 then
     echo "rsync_bin $rsync_bin is not a file" >&2
@@ -176,8 +193,8 @@ prep_scratch() {
     return 0
 }
 
-discard_scratch() {
-    [ -d "$scratchdir" ] && rm -rf "$scratchdir"
+maybe_discard_scratch() {
+    [ x"$preserve_scratch" != xyes ] && [ -d "$scratchdir" ] && rm -rf "$scratchdir"
     return 0
 }
 
@@ -191,7 +208,6 @@ do
     testbase=`echo $testscript | sed 's!.*/!!' | sed -e 's/.test\$//'`
     scratchdir="$scratchbase.$testbase"
 
-    echo "----- $testbase starting"
     prep_scratch
 
     set +e
@@ -199,21 +215,34 @@ do
     result=$?
     set -e
 
+    if [ "x$always_log" = xyes -o \( $result != 0 -a $result != 77 -a $result != 78 \) ]
+    then
+       echo "----- $testbase log follows"
+       cat "$scratchdir/test.log"
+       echo "----- $testbase log ends"
+    fi
+
     case $result in
     0)
-       echo "----- $testbase completed successfully"
+       echo "PASS    $testbase"
        passed=`expr $passed + 1`
-       discard_scratch
+       maybe_discard_scratch
        ;;
     77)
-       echo "----- $testbase skipped"
+       # backticks will fill the whole file onto one line, which is a feature
+       echo "SKIP    $testbase (`cat \"$scratchdir/whyskipped\"`)"
        skipped=`expr $skipped + 1`
-       discard_scratch
+       maybe_discard_scratch
+       ;;
+    78)
+        # It failed, but we expected that.  don't dump out error logs, 
+       # because most users won't want to see them.  But do leave
+       # the working directory around.
+       echo "XFAIL   $testbase"
+       failed=`expr $failed + 1`
        ;;
     *)
-       echo "----- $testbase failed: log follows"
-       cat "$scratchdir/test.log"
-       echo "----- $testbase log ends"
+       echo "FAIL    $testbase"
        failed=`expr $failed + 1`
        if [ "x$nopersist" = "xyes" ]
        then