If there is no lchown(), don't try to set the user & group of a symlink.

[rsync/rsync.git] / runtests.sh

diff --git a/runtests.sh b/runtests.sh
index d3755ae..e64f1b3 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=`id -un || 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
@@ -203,6 +220,11 @@ do
        echo "----- $testbase log follows"
        cat "$scratchdir/test.log"
        echo "----- $testbase log ends"
+       if [ -f "$scratchdir/rsyncd.log" ]; then
+           echo "----- $testbase rsyncd.log follows"
+           cat "$scratchdir/rsyncd.log"
+           echo "----- $testbase rsyncd.log ends"
+       fi
     fi
 
     case $result in
@@ -212,7 +234,9 @@ do
        maybe_discard_scratch
        ;;
     77)
-       echo "SKIP    $testbase"
+       # backticks will fill the whole file onto one line, which is a feature
+       whyskipped=`cat "$scratchdir/whyskipped"`
+       echo "SKIP    $testbase ($whyskipped)"
        skipped=`expr $skipped + 1`
        maybe_discard_scratch
        ;;