X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1657be22a3bf3d0978100e81aa292128dc04a573..efd5ee57867a5de86692dff3ec0067c4113980fa:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index bb0b34a6..e64f1b3b 100755
--- 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`"
@@ -220,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