From 4337e8532e28c1156cff95b84d592041553072e2 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 11 Jan 2018 10:51:42 +0100 Subject: Exclude matching: Speedup the full-path traversal case Previously we'd use the full regex when the bname triggered a full-path matching to take place. Now we have a simplified full-traversal regex for this case that can be significantly faster to apply. Triggered by #5017 but doesn't actually solve it. --- test/csync/csync_tests/check_csync_exclude.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/csync/csync_tests/check_csync_exclude.cpp b/test/csync/csync_tests/check_csync_exclude.cpp index 41f3261d5..f719aa4aa 100644 --- a/test/csync/csync_tests/check_csync_exclude.cpp +++ b/test/csync/csync_tests/check_csync_exclude.cpp @@ -118,10 +118,13 @@ static void check_csync_exclude_add(void **) assert_true(excludedFiles->_allExcludes.contains("/tmp/check_csync1/*")); assert_true(excludedFiles->_fullRegexFile.pattern().contains("csync1")); - assert_false(excludedFiles->_bnameActivationRegexFile.pattern().contains("csync1")); + assert_true(excludedFiles->_fullTraversalRegexFile.pattern().contains("csync1")); + assert_false(excludedFiles->_bnameTraversalRegexFile.pattern().contains("csync1")); excludedFiles->addManualExclude("foo"); - assert_true(excludedFiles->_bnameActivationRegexFile.pattern().contains("foo")); + assert_true(excludedFiles->_bnameTraversalRegexFile.pattern().contains("foo")); + assert_true(excludedFiles->_fullRegexFile.pattern().contains("foo")); + assert_false(excludedFiles->_fullTraversalRegexFile.pattern().contains("foo")); } static void check_csync_excluded(void **) -- cgit v1.2.3