LOG=${TMP}/log
RSYNC="$rsync_bin"
-# UID & GID to run rsyncd as if testsuite is running as root
-#
-# We don't know if this machine has "nobody" or "nogroup", so use the
-# quasi-canonical values of (uint16_t) -2.
-RSYNCD_UID=65534
-RSYNCD_GID=65534
-
# Berkley's nice.
PATH="$PATH:/usr/ucb"
+if diff -u $srcdir/testsuite/rsync.fns $srcdir/testsuite/rsync.fns >/dev/null 2>&1; then
+ diffopt="-u"
+else
+ diffopt="-c"
+fi
+
runtest() {
echo $ECHO_N "Test $1: $ECHO_C"
if eval "$2"
echo ""
for f in `cd "$2"; find . -type f -print `
do
- diff -c "$2"/"$f" "$3"/"$f" || failed=YES
+ diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
done
echo "-------------"
echo ""
( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from
( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to
- diff -c ${TMP}/ls-from ${TMP}/ls-to || failed=YES
+ diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
if [ -z "${failed}" ] ; then
return 0
else
use chroot = no
hosts allow = localhost, 127.0.0.1
log file = $logfile
+max verbosity = 9
-uid = $RSYNCD_UID
-gid = $RSYNCD_GID
+uid = 0
+gid = 0
[test-from]
path = $FROM