X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/53e1f937bc8fdfdf4caa1ec9e10101bee3d67d99..7a176e87d56de890fed07b1621277ab74b21b706:/runtests.sh diff --git a/runtests.sh b/runtests.sh index 50f4c8bc..31c49369 100755 --- 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,12 +142,7 @@ echo "$0 running in `pwd`" echo " rsync_bin=$rsync_bin" echo " srcdir=$srcdir" -if testuser=`whoami` -then - : -else - testuser='(unknown)' -fi +testuser=`whoami || echo UNKNOWN` echo " testuser=$testuser" echo " os=`uname -a`" @@ -222,7 +220,8 @@ do maybe_discard_scratch ;; 77) - echo "SKIP $testbase" + # backticks will fill the whole file onto one line, which is a feature + echo "SKIP $testbase (`cat \"$scratchdir/whyskipped\"`)" skipped=`expr $skipped + 1` maybe_discard_scratch ;;