From: Wayne Davison <wayned@samba.org>
Date: Wed, 23 Apr 2003 02:15:59 +0000 (+0000)
Subject: Changed one part of the exclude-test setup to test the --existing
X-Git-Tag: v2.5.7~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=337a1a86a7594842d58d104c56b79a265ea617c4;p=thirdparty%2Frsync.git

Changed one part of the exclude-test setup to test the --existing
option.  Also tweaked a few comment lines.
---

diff --git a/testsuite/exclude.test b/testsuite/exclude.test
index 7d75012a..793eb985 100644
--- a/testsuite/exclude.test
+++ b/testsuite/exclude.test
@@ -54,10 +54,10 @@ cat >"$excl" <<EOF
 EOF
 
 # Create the chk dir with what we expect to be excluded
+
 checkit "$RSYNC -avv \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir"
 
-# Ensure that the following removes will tweak the directory times.
-sleep 1
+sleep 1 # Ensures that the rm commands will tweak the directory times.
 
 # XXX Note modified to work with current broken behavior (to be fixed soon!)
 rm -r "$chkdir"/foo/down
@@ -67,12 +67,12 @@ rm "$chkdir"/foo/file[235-9]
 rm -r "$chkdir"/bar # XXX
 rm "$chkdir"/mid/for/foo/extra
 
-# Make sure that the tweaked dirs times migrate back but nothing else.
-$RSYNC -av --include='*/' --exclude='*' "$chkdir/" "$fromdir/"
+# Un-tweak the directory times in our first (weak) exclude test (though
+# it's a good test of the --existing option).
+$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
 
-# Now, test if rsync excludes the same files
+# Now, test if rsync excludes the same files.
 
 checkit "$RSYNC -avv --exclude-from=$excl \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
 
 exit 0
-# last [] may have failed but if we get here then we've won