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 31c4936..e64f1b3 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -142,11 +142,20 @@ echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 
-testuser=`whoami || echo UNKNOWN`
+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
@@ -211,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
@@ -221,7 +235,8 @@ do
        ;;
     77)
        # backticks will fill the whole file onto one line, which is a feature
-       echo "SKIP    $testbase (`cat \"$scratchdir/whyskipped\"`)"
+       whyskipped=`cat "$scratchdir/whyskipped"`
+       echo "SKIP    $testbase ($whyskipped)"
        skipped=`expr $skipped + 1`
        maybe_discard_scratch
        ;;