X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d96d3893ddc9d5b2d3cb8405d2fccb5b75a8b717..4acbfa2ade4b81fbc5af5bc30f97b9feb9a40545:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index f9660d62..e7e2e2d7 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -24,6 +24,9 @@ TO=${TMP}/to
 LOG=${TMP}/log
 RSYNC="$rsync_bin"
 
+# Berkley's nice.
+PATH="$PATH:/usr/ucb"
+
 runtest() {
     echo $ECHO_N "Test $1: $ECHO_C"
     if eval "$2"
@@ -134,6 +137,11 @@ makepath () {
 # 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=
 
@@ -201,6 +209,12 @@ use chroot = no
 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
+
 [test-from]
 	path = $FROM
 	read only = yes
@@ -230,6 +244,7 @@ test_fail() {
 
 test_skipped() {
     echo "$@" >&2
+    echo "$@" > "$TMP/whyskipped"
     exit 77
 }
 
@@ -246,5 +261,11 @@ is_a_link() {
     test -L "$1" || test -h "$1" || /usr/bin/test -L "$1" || /usr/bin/test -h "$1"
 }
 
-# be reproducible
-umask 077
\ No newline at end of file
+
+# 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
\ No newline at end of file