X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0314302e9cbe851f05b6f4567f2c1978a38471e3..434e77193cfb17e92a70e6519fd091700a2ec5a4:/testsuite/exclude.test

diff --git a/testsuite/exclude.test b/testsuite/exclude.test
index 23a4d976..1aa33e32 100644
--- a/testsuite/exclude.test
+++ b/testsuite/exclude.test
@@ -2,7 +2,7 @@
 
 # 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.  
@@ -12,11 +12,8 @@
 
 . "$suitedir/rsync.fns"
 
-HOME="$scratchdir"
 CVSIGNORE='*.junk'
-export HOME CVSIGNORE
-
-set -x
+export CVSIGNORE
 
 # Build some files/dirs/links to copy
 
@@ -25,6 +22,8 @@ makepath "$fromdir/foo/sub"
 makepath "$fromdir/bar/down/to/foo/too"
 makepath "$fromdir/bar/down/to/bar/baz"
 makepath "$fromdir/mid/for/foo/and/that/is/who"
+makepath "$fromdir/new/keep/this"
+makepath "$fromdir/new/lose/this"
 cat >"$fromdir/.filt" <<EOF
 exclude down
 : .filt-temp
@@ -92,6 +91,9 @@ cat >"$excl" <<EOF
 # These should float at the end of the path.
 + foo/s?b/
 - foo/*/
+# Test how /** differs from /***
+- new/keep/**
+- new/lose/***
 # Test some normal excludes.  Competing lines are paired.
 + t[o]/
 - to
@@ -112,6 +114,8 @@ 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
+rm -r "$chkdir"/new/lose
 rm "$chkdir"/foo/file[235-9]
 rm "$chkdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo/file[235-9]
 rm "$chkdir"/mid/for/foo/extra
@@ -199,5 +203,15 @@ $RSYNC -av --delete-excluded --exclude='*' "$fromdir/" "$todir/"
 checkit "$RSYNC -avv -f dir-merge,-_.excl \
     \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
 
+set -x
+
+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