X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/751411c40d2fd4bbb0df2dde10c176171fb0d669..e052b21f32e69c0368ec1379b4cd22ebe662e557:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index b3df5242..811c9bad 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -20,10 +20,26 @@ printmsg() {
     echo "$1"
 }
 
+
+####################
+# Build test directories TO and FROM, with FROM full of files.
+
 hands_setup() {
     [ -d $FROM ] || mkdir $FROM
     [ -d $TO ] || mkdir $TO
 
+    # On some BSD systems, the umask affects the mode of created
+    # symlinks, even though the mode apparently has no effect on how
+    # the links behave in the future, and it cannot be changed using
+    # chmod!  rsync always sets its umask to 000 so that it can
+    # accurately recreate permissions, but this script is probably run
+    # with a different umask. 
+
+    # This causes a little problem that "ls -l" of the two will not be
+    # the same.  So, we need to set our umask before doing any creations.
+
+    umask 0
+
     # set up test data
     touch ${FROM}/empty
     mkdir ${FROM}/emptydir
@@ -42,9 +58,12 @@ hands_setup() {
     ls -ltr /etc > ${FROM}/dir/subdir/subsubdir/etc-ltr-list
     mkdir ${FROM}/dir/subdir/subsubdir2
     ls -lt /bin > ${FROM}/dir/subdir/subsubdir2/bin-lt-list
+
+    umask 077
 }
 
 
+
 ###########################
 # Run a test (in '$1') then compare directories $2 and $3 to see if
 # there are any difference.  If there are, explain them.
@@ -66,13 +85,13 @@ checkit() {
     echo "-------------">>${log}
     echo "check how the files compare with diff:">>${log}
     echo "">>${log}
-    diff -ur $2 $3 >>${log} 2>&1 || failed=YES
+    diff -cr $2 $3 >>${log} 2>&1 || failed=YES
     echo "-------------">>${log}
     echo "check how the directory listings compare with diff:">>${log}
     echo "">>${log}
     ( cd $2 ; ls -laR ) > ${TMP}/ls-from 2>>${log}
     ( cd $3 ; ls -laR ) > ${TMP}/ls-to  2>>${log}
-    diff -u ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
+    diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
     if [ -z "${failed}" ] ; then
 	echo "${ECHO_T}	done."
 	rm $log
@@ -100,3 +119,30 @@ checkforlogs() {
   fi
 }
 
+
+build_rsyncd_conf() {
+    # Build an appropriate configuration file
+    conf="$scratchdir/test-rsyncd.conf"
+    echo "building configuration $conf"
+
+    port=2612
+    pidfile="$scratchdir/rsyncd.pid"
+    logfile="$scratchdir/rsyncd.log"
+
+    cat >$conf <<EOF
+# rsyncd configuration file autogenerated by $0
+
+pid file = $pidfile
+use chroot = no
+hosts allow = localhost, 127.0.0.1
+log file = $logfile
+
+[test-from] = $scratchdir/daemon-from/
+	read only = yes
+
+[test-to] = $scratchdir/daemon-to/
+	read only = no
+EOF
+}
+
+