X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d1239eae921d013ffeb118b1a768308e28bd9f11..37c817eb8159366539d4a9c69bd78e74d4941c06:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index d2865ae3..68d7313b 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`"
@@ -230,7 +230,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
 	;;