}
-hands_cleanup() {
- rm -r "$TMP"
-}
-
-
-
-
####################
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
echo ""
for f in `cd "$2"; find . -type f -print `
do
- diff -c "$2"/"$f" "$3"/"$f" || failed=YES
+ diff -u "$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 -u ${TMP}/ls-from ${TMP}/ls-to || failed=YES
if [ -z "${failed}" ] ; then
return 0
else
}
-# In fact, we need a more general feature of capturing all stderr/log files,
-# and dumping them if something goes wrong.
-
-checkforlogs() {
- # skip it if we're under debian-test
- if test -n "${Debian}" ; then return 0 ; fi
-
- if [ -f $1 -a -s $1 ] ; then
- echo "Failures have occurred. $1 follows:" >&2
- cat $1 >&2
- exit 1
- fi
-}
-
-
build_rsyncd_conf() {
# Build an appropriate configuration file
conf="$scratchdir/test-rsyncd.conf"
hosts allow = localhost, 127.0.0.1
log file = $logfile
-# We don't know if this machine has "nobody" or "nogroup", so use the quasi-canonical
-# values of (uint16_t) -2.
-
-uid = 65534
-gid = 65534
+uid = 0
+gid = 0
[test-from]
path = $FROM
fi
done
done
+# ok, now get rid of it
+rm "$scratchdir/testlink"
if [ "x$TEST_SYMLINK_CMD" = 'x' ]
# best thing is probably to explicitly chmod those directories after
# creation.
-umask 022
\ No newline at end of file
+umask 022