diff options
| author | Wayne Davison <wayned@samba.org> | 2005-02-08 19:30:07 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-02-08 19:30:07 +0000 |
| commit | e79666267dca1199f7c95f151d2d693a2f24aa62 (patch) | |
| tree | a3f58037137647a93488f4f047eed6fb821804b8 /testsuite/exclude.test | |
| parent | d91de04671de9138da2c918357f1fdc199d25304 (diff) | |
| download | rsync-e79666267dca1199f7c95f151d2d693a2f24aa62.tar.gz | |
Also test the new long-named filter rules.
Diffstat (limited to 'testsuite/exclude.test')
| -rw-r--r-- | testsuite/exclude.test | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/testsuite/exclude.test b/testsuite/exclude.test index 56b612a4..61688611 100644 --- a/testsuite/exclude.test +++ b/testsuite/exclude.test @@ -25,9 +25,9 @@ makepath "$fromdir/bar/down/to/foo/too" makepath "$fromdir/bar/down/to/bar/baz" makepath "$fromdir/mid/for/foo/and/that/is/who" cat >"$fromdir/.excl" <<EOF -- down +exclude down : .excl-temp -! +clear - .excl - *.bak - *.old @@ -36,12 +36,12 @@ echo kept >"$fromdir/foo/file1" echo removed >"$fromdir/foo/file2" echo cvsout >"$fromdir/foo/file2.old" cat >"$fromdir/foo/.excl" <<EOF -+ .excl +include .excl - file1 EOF cat >"$fromdir/bar/.excl" <<EOF - home-cvs-exclude -: .excl2 +dir-merge .excl2 + to EOF echo cvsout >"$fromdir/bar/down/to/home-cvs-exclude" @@ -129,12 +129,12 @@ rm "$chkdir"/bar/down/to/foo/*.junk rm "$chkdir"/bar/down/to/home-cvs-exclude rm "$chkdir"/mid/one-in-one-out -$RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/" +$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=\". $excl\" --delete-excluded \ +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. @@ -156,7 +156,7 @@ $RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/" # file. checkit "sed '/!/d' \"$excl\" | - $RSYNC -avv -f :_.excl -f ._- \ + $RSYNC -avv -f dir-merge_.excl -f merge_- \ --delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" # Remove the files that --delete-excluded will delete. |