LOG=${TMP}/log
RSYNC="$rsync_bin"
+# 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"
rsync_ls_lR() {
- find "$@" -print | sort | xargs $TLS
+ find "$@" -print | sort | xargs "$TOOLDIR/tls"
+}
+
+rsync_getgroups() {
+ "$TOOLDIR/getgroups"
}
}
-hands_cleanup() {
- rm -r "$TMP"
-}
-
-
-
-
####################
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
# Run a test (in '$1') then compare directories $2 and $3 to see if
# there are any difference. If there are, explain them.
+# So normally basically $1 should be an rsync command, and $2 and $3
+# the source and destination directories. This is only good when you
+# expect to transfer the whole directory exactly as is. If some files
+# should be excluded, you might need to use something else.
+
checkit() {
failed=
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
}
-# 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
-[test-from] = $scratchdir/daemon-from/
+uid = 0
+gid = 0
+
+[test-from]
+ path = $FROM
read only = yes
-[test-to] = $scratchdir/daemon-to/
+[test-to]
+ path = $TO
read only = no
EOF
}
test_skipped() {
echo "$@" >&2
+ echo "$@" > "$TMP/whyskipped"
exit 77
}
exit 78
}
-# be reproducible
-umask 077
\ No newline at end of file
+# Determine what shell command will appropriately test for links.
+ln -s foo "$scratchdir/testlink"
+for cmd in test /bin/test /usr/bin/test /usr/ucb/bin/test /usr/ucb/test
+do
+ for switch in -h -L
+ do
+ if $cmd $switch "$scratchdir/testlink" 2>/dev/null
+ then
+ # how nice
+ TEST_SYMLINK_CMD="$cmd $switch"
+ # i wonder if break 2 is portable?
+ break 2
+ fi
+ done
+done
+# ok, now get rid of it
+rm "$scratchdir/testlink"
+
+
+if [ "x$TEST_SYMLINK_CMD" = 'x' ]
+then
+ test_fail "Couldn't determine how to test for symlinks"
+else
+ echo "Testing for symlinks using '$TEST_SYMLINK_CMD'"
+fi
+
+
+# Test whether something is a link, allowing for shell peculiarities
+is_a_link() {
+ # note the variable contains the first option and therefore is not quoted
+ $TEST_SYMLINK_CMD "$1"
+}
+
+
+# We need to set the umask to be reproducible. Note also that when we
+# do some daemon tests as root, we will setuid() and therefore the
+# directory has to be writable by the nobody user in some cases. The
+# best thing is probably to explicitly chmod those directories after
+# creation.
+
+umask 022