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`"
fi
RSYNC="$rsync_bin"
+#RSYNC="valgrind --tool=addrcheck $rsync_bin"
export rsync_bin RSYNC
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 "----- $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
;;
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
;;