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 50f4c8b..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,16 +142,20 @@ echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 
-if testuser=`whoami`
-then
-    :
-else 
-    testuser='(unknown)'
-fi
+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
@@ -222,7 +229,8 @@ do
        maybe_discard_scratch
        ;;
     77)
-       echo "SKIP    $testbase"
+       # backticks will fill the whole file onto one line, which is a feature
+       echo "SKIP    $testbase (`cat \"$scratchdir/whyskipped\"`)"
        skipped=`expr $skipped + 1`
        maybe_discard_scratch
        ;;