. "./shconfig"
RUNSHFLAGS='-e'
+export RUNSHFLAGS
# for Solaris
-PATH="/usr/xpg4/bin/:$PATH"
+[ -d /usr/xpg4/bin ] && PATH="/usr/xpg4/bin/:$PATH"
-if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
-then
- if set -x
- then
+if [ "x$loglevel" != x ] && [ "$loglevel" -gt 8 ]; then
+ if set -x; then
# If it doesn't work the first time, don't keep trying.
RUNSHFLAGS="$RUNSHFLAGS -x"
fi
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
-testuser=`id -un || whoami || echo UNKNOWN`
+if [ -f /usr/bin/whoami ]; then
+ testuser=`/usr/bin/whoami`
+elif [ -f /usr/ucb/whoami ]; then
+ testuser=`/usr/ucb/whoami`
+elif [ -f /bin/whoami ]; then
+ testuser=`/bin/whoami`
+else
+ testuser=`id -un 2>/dev/null || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
+fi
echo " testuser=$testuser"
echo " os=`uname -a`"
# It must be "yes", not just nonnull
-if test "x$preserve_scratch" = xyes
-then
+if [ "x$preserve_scratch" = xyes ]; then
echo " preserve_scratch=yes"
else
echo " preserve_scratch=no"
fi
-if test ! -f $rsync_bin
-then
+if [ ! -f "$rsync_bin" ]; then
echo "rsync_bin $rsync_bin is not a file" >&2
exit 2
fi
-if test ! -d $srcdir
-then
+if [ ! -d "$srcdir" ]; then
echo "srcdir $srcdir is not a directory" >&2
exit 2
fi
RSYNC="$rsync_bin"
+#RSYNC="valgrind --tool=addrcheck $rsync_bin"
export rsync_bin RSYNC
return 0
}
-if [ "x$whichtests" = x ]
-then
+if [ "x$whichtests" = x ]; then
whichtests="*.test"
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
*)
echo "FAIL $testbase"
failed=`expr $failed + 1`
- if [ "x$nopersist" = "xyes" ]
- then
+ if [ "x$nopersist" = xyes ]; then
exit 1
fi
esac