Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Martin gave his approval to use GPLv3 with this code.
[rsync/rsync.git]
/
testsuite
/
exclude.test
diff --git
a/testsuite/exclude.test
b/testsuite/exclude.test
index
e412d30
..
33168dd
100644
(file)
--- a/
testsuite/exclude.test
+++ b/
testsuite/exclude.test
@@
-5,7
+5,7
@@
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
# 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.
# Test some of the more obscure wildcard handling of exclude/include
# processing.
@@
-76,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"
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.
# Setup our test exclude/include files.
@@
-106,12
+105,17
@@
cat >"$scratchdir/.cvsignore" <<EOF
home-cvs-exclude
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.
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"/foo/down
rm -r "$chkdir"/mid/for/foo/and
rm -r "$chkdir"/new/keep/this