Improved the --delete-excluded test based on Matt's input and

another corner case I noticed.

diff --git a/testsuite/delete.test b/testsuite/delete.test
index 58fa82c..00e3614 100644 (file)
--- a/testsuite/delete.test
+++ b/testsuite/delete.test
@@ -23,15 +23,19 @@ checkit "$RSYNC -avv --remove-sent-files \
 
 diff -r "$chkdir/empty" "$fromdir"
 
-# Make sure that --delete-excluded does not dump a per-dir merge-file filter.
+# 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"
+touch "$todir/foo" "$todir/bar" "$todir/baz"
 
-$RSYNC -r --filter=': filters' --delete-excluded "$fromdir/" "$todir/"
+$RSYNC -r --exclude=baz --filter=': filters' --delete-excluded "$fromdir/" "$todir/"
 
-test -f "$todir/foo" || test_fail "rsync incorrectly elided the merge file"
+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