X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b62fd393922308956040327ddeefc8fa7b17bfff..458aeea4a6158e8bfad5ba93ad482f3760260f07:/testsuite/exclude.test

diff --git a/testsuite/exclude.test b/testsuite/exclude.test
index eda1ec99..09c0e799 100644
--- a/testsuite/exclude.test
+++ b/testsuite/exclude.test
@@ -16,12 +16,17 @@ HOME="$scratchdir"
 CVSIGNORE='*.junk'
 export HOME CVSIGNORE
 
+set -x
+
 # Build some files/dirs/links to copy
 
 makepath "$fromdir/foo/down/to/you"
+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
@@ -30,13 +35,14 @@ clear
 - *.bak
 - *.old
 EOF
-echo kept >"$fromdir/foo/file1"
+echo filtered-1 >"$fromdir/foo/file1"
 echo removed >"$fromdir/foo/file2"
 echo cvsout >"$fromdir/foo/file2.old"
 cat >"$fromdir/foo/.filt" <<EOF
 include .filt
-- file1
+- /file1
 EOF
+echo not-filtered-1 >"$fromdir/foo/sub/file1"
 cat >"$fromdir/bar/.filt" <<EOF
 - home-cvs-exclude
 dir-merge .filt2
@@ -85,8 +91,12 @@ cat >"$excl" <<EOF
 - /bar
 # This should match against the whole path, not just the name.
 + foo**too
-# This should float at the end of the path.
+# 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
@@ -107,6 +117,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
@@ -166,7 +178,7 @@ rm "$chkdir"/bar/down/to/foo/.filt2
 rm "$chkdir"/bar/down/to/bar/.filt2
 rm "$chkdir"/mid/.filt
 
-$RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/"
+$RSYNC -av --protocol=28 --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
 
 # Now, try the prior command with --delete-before and some side-specific
 # rules.