X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/90d5b12e7278a2bb9b01da4f18884e325e940696..44ae54114ac29ebe6bff34f98e59e51d3cb71a40:/testsuite/exclude.test

diff --git a/testsuite/exclude.test b/testsuite/exclude.test
index 09c0e799..099344f2 100644
--- a/testsuite/exclude.test
+++ b/testsuite/exclude.test
@@ -2,21 +2,18 @@
 
 # Copyright (C) 2003, 2004, 2005 by Wayne Davison <wayned@samba.org>
 
-# This program is distributable under the terms of the GNU GPL see
+# This program is distributable under the terms of the GNU GPL (see
 # COPYING).
 
-# Test rsync handling of exclude/include directives.  
+# Test rsync handling of exclude/include directives.
 
 # Test some of the more obscure wildcard handling of exclude/include
 # processing.
 
 . "$suitedir/rsync.fns"
 
-HOME="$scratchdir"
 CVSIGNORE='*.junk'
-export HOME CVSIGNORE
-
-set -x
+export CVSIGNORE
 
 # Build some files/dirs/links to copy
 
@@ -79,7 +76,6 @@ EOF
 echo cvsin >"$fromdir/mid/for/one-in-one-out"
 echo expunged >"$fromdir/mid/for/foo/extra"
 echo retained >"$fromdir/mid/for/foo/keep"
-ln -s too "$fromdir/bar/down/to/foo/sym"
 
 # Setup our test exclude/include files.
 
@@ -109,12 +105,17 @@ cat >"$scratchdir/.cvsignore" <<EOF
 home-cvs-exclude
 EOF
 
-# Create the chk dir with what we expect to be excluded
+# Start with a check of --prune-empty-dirs:
+$RSYNC -av -f -_foo/too/ -f -_foo/down/ -f -_foo/and/ -f -_new/ "$fromdir/" "$chkdir/"
+checkit "$RSYNC -av --prune-empty-dirs '$fromdir/' '$todir/'" "$chkdir" "$todir"
+rm -rf "$todir"
 
-checkit "$RSYNC -avv \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir"
+# Add a directory symlink.
+ln -s too "$fromdir/bar/down/to/foo/sym"
 
+# Create chkdir with what we expect to be excluded.
+checkit "$RSYNC -avv '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir"
 sleep 1 # Ensures that the rm commands will tweak the directory times.
-
 rm -r "$chkdir"/foo/down
 rm -r "$chkdir"/mid/for/foo/and
 rm -r "$chkdir"/new/keep/this
@@ -129,8 +130,8 @@ $RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
 
 # Now, test if rsync excludes the same files.
 
-checkit "$RSYNC -avv --exclude-from=\"$excl\" \
-    --delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+checkit "$RSYNC -avv --exclude-from='$excl' \
+    --delete-during '$fromdir/' '$todir/'" "$chkdir" "$todir"
 
 # Modify the chk dir by removing cvs-ignored files and then tweaking the dir times.
 
@@ -145,29 +146,29 @@ $RSYNC -av --existing --filter='exclude,! */' "$fromdir/" "$chkdir/"
 # Now, test if rsync excludes the same files, this time with --cvs-exclude
 # and --delete-excluded.
 
-checkit "$RSYNC -avvC --filter=\"merge $excl\" --delete-excluded \
-    --delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+checkit "$RSYNC -avvC --filter='merge $excl' --delete-excluded \
+    --delete-during '$fromdir/' '$todir/'" "$chkdir" "$todir"
 
 # Modify the chk dir for our merge-exclude test and then tweak the dir times.
 
 rm "$chkdir"/foo/file1
 rm "$chkdir"/bar/down/to/bar/baz/*.deep
-cp -p "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
-cp -p "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo
+cp_touch "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
+cp_touch "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo
 
 $RSYNC -av --existing -f 'show .filt*' -f 'hide,! */' --del "$fromdir/" "$todir/"
 
 echo retained >"$todir"/bar/down/to/bar/baz/nodel.deep
-cp -p "$todir"/bar/down/to/bar/baz/nodel.deep "$chkdir"/bar/down/to/bar/baz
+cp_touch "$todir"/bar/down/to/bar/baz/nodel.deep "$chkdir"/bar/down/to/bar/baz
 
 $RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/"
 
 # Now, test if rsync excludes the same files, this time with a merge-exclude
 # file.
 
-checkit "sed '/!/d' \"$excl\" |
+checkit "sed '/!/d' '$excl' |
     $RSYNC -avv -f dir-merge_.filt -f merge_- \
-    --delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+    --delete-during '$fromdir/' '$todir/'" "$chkdir" "$todir"
 
 # Remove the files that will be deleted.
 
@@ -183,9 +184,9 @@ $RSYNC -av --protocol=28 --existing --include='*/' --exclude='*' "$fromdir/" "$c
 # Now, try the prior command with --delete-before and some side-specific
 # rules.
 
-checkit "sed '/!/d' \"$excl\" |
+checkit "sed '/!/d' '$excl' |
     $RSYNC -avv -f :s_.filt -f .s_- -f P_nodel.deep \
-    --delete-before \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+    --delete-before '$fromdir/' '$todir/'" "$chkdir" "$todir"
 
 # Next, we'll test some rule-restricted filter files.
 
@@ -204,7 +205,15 @@ $RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/"
 $RSYNC -av --delete-excluded --exclude='*' "$fromdir/" "$todir/"
 
 checkit "$RSYNC -avv -f dir-merge,-_.excl \
-    \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+    '$fromdir/' '$todir/'" "$chkdir" "$todir"
+
+relative_opts='--relative --chmod=Du+w --copy-unsafe-links'
+$RSYNC -av $relative_opts "$fromdir/foo" "$chkdir/"
+rm -rf "$chkdir$fromdir/foo/down"
+$RSYNC -av $relative_opts --existing --filter='-! */' "$fromdir/foo" "$chkdir/"
+
+checkit "$RSYNC -avv $relative_opts --exclude='$fromdir/foo/down' \
+    '$fromdir/foo' '$todir'" "$chkdir$fromdir/foo" "$todir$fromdir/foo"
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0