In clean_flist(), if a duplicate is found for a dir and a non-dir,

[rsync/rsync.git] / runtests.sh

diff --git a/runtests.sh b/runtests.sh
index d2865ae..f5655e7 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -142,7 +142,7 @@ 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`"
@@ -169,6 +169,7 @@ then
 fi
 
 RSYNC="$rsync_bin"
+#RSYNC="valgrind --tool=addrcheck $rsync_bin"
 
 export rsync_bin RSYNC
 
@@ -205,7 +206,7 @@ fi
 
 for testscript in $suitedir/$whichtests
 do
-    testbase=`echo $testscript | sed 's!.*/!!' | sed -e 's/.test\$//'`
+    testbase=`echo $testscript | sed -e 's!.*/!!' -e 's/.test\$//'`
     scratchdir="$scratchbase.$testbase"
 
     prep_scratch
@@ -220,6 +221,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
@@ -230,7 +236,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
        ;;