X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13725744fde97fd9e511adb118ee2c9389116243..3aeedbfd116d66b7d11d4d7df75ed948b9c9f88b:/testsuite/delete.test

diff --git a/testsuite/delete.test b/testsuite/delete.test
index 1400bc24..00e3614f 100644
--- a/testsuite/delete.test
+++ b/testsuite/delete.test
@@ -2,15 +2,13 @@
 
 # Copyright (C) 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 various delete directives.  
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 hands_setup
 
 makepath "$chkdir"
@@ -25,5 +23,19 @@ checkit "$RSYNC -avv --remove-sent-files \
 
 diff -r "$chkdir/empty" "$fromdir"
 
+# Make sure that "P" but not "-" per-dir merge-file filters take effect with
+# --delete-excluded.
+cat >"$todir/filters" <<EOF
+P foo
+- bar
+EOF
+touch "$todir/foo" "$todir/bar" "$todir/baz"
+
+$RSYNC -r --exclude=baz --filter=': filters' --delete-excluded "$fromdir/" "$todir/"
+
+test -f "$todir/foo" || test_fail "rsync deleted $todir/foo"
+test -f "$todir/bar" && test_fail "rsync did not delete $todir/bar"
+test -f "$todir/baz" && test_fail "rsync did not delete $todir/baz"
+
 # The script would have aborted on error, so getting here means we've won.
 exit 0