Changeset 92087 in webkit

Timestamp:

Jul 31, 2011 1:40:55 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

Use set comparison to find duplicate or overlapping specifiers in test expectations.
​https://bugs.webkit.org/show_bug.cgi?id=65430

Reviewed by Adam Barth.

• Scripts/webkitpy/layout_tests/models/test_expectations.py: Changed to use set comparisons, because length

of a set is wrong.

• Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Added some unit tests to actually catch

regressions.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/models/test_expectations.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/test_expectations_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-31  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Use set comparison to find duplicate or overlapping specifiers in test expectations.
+        https://bugs.webkit.org/show_bug.cgi?id=65430
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py: Changed to use set comparisons, because length
+            of a set is wrong.
+        * Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Added some unit tests to actually catch
+            regressions.
+
 2011-07-31  Xan Lopez  <xlopez@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

@@ -528 +528 @@
         # to be warnings and return False".
 
-        prev_specificity = len(prev_expectation_line.matching_configurations)
-        specificity = len(prev_expectation_line.matching_configurations)
-        if prev_specificity == specificity:
+        if prev_expectation_line.matching_configurations == expectation_line.matching_configurations:
             expectation_line.errors.append('Duplicate or ambiguous %s.' % expectation_source)
             return True
 
-        if prev_specificity < specificity:
+        if prev_expectation_line.matching_configurations >= expectation_line.matching_configurations:
             expectation_line.errors.append('More specific entry on line %d overrides line %d' % (expectation_line.line_number, prev_expectation_line.line_number))
             # FIXME: return False if we want more specific to win.
             return True
 
-        expectation_line.errors.append('More specific entry on line %d overrides line %d' % (prev_expectation_line.line_number, expectation_line.line_number))
-        return True
+        if prev_expectation_line.matching_configurations <= expectation_line.matching_configurations:
+            expectation_line.errors.append('More specific entry on line %d overrides line %d' % (prev_expectation_line.line_number, expectation_line.line_number))
+            return True
+
+        if prev_expectation_line.matching_configurations & expectation_line.matching_configurations:
+            expectation_line.errors.append('Entries on line %d and line %d match overlapping sets of configurations' % (prev_expectation_line.line_number, expectation_line.line_number))
+            return True
+
+        # Configuration sets are disjoint, then.
+        return False
 
 

trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py

@@ -152 +152 @@
             "Duplicate or ambiguous expectation. %s  [test/expectations] [5]" % self._test_file)
 
+        self.assert_lines_lint(
+            ["BUGWK1 LEOPARD : passes/text.html = PASS",
+             "BUGWK1 MAC : passes/text.html = TIMEOUT"],
+            "More specific entry on line 1 overrides line 2 passes/text.html  [test/expectations] [5]")
+
+        self.assert_lines_lint(
+            ["BUGWK1 LEOPARD : passes/text.html = PASS",
+             "BUGWK1 LEOPARD RELEASE : passes/text.html = TIMEOUT"],
+            "More specific entry on line 2 overrides line 1 passes/text.html  [test/expectations] [5]")
+
+        self.assert_lines_lint(
+            ["BUGWK1 RELEASE : passes/text.html = PASS",
+             "BUGWK1 CPU : passes/text.html = TIMEOUT"],
+            "Entries on line 1 and line 2 match overlapping sets of configurations passes/text.html  [test/expectations] [5]")
+
+        self.assert_lines_lint(
+            ["BUGWK1 WIN : passes/text.html = PASS",
+             "BUGWK1 MAC : passes/text.html = TIMEOUT"],
+            "")
+
+        self.assert_lines_lint(
+            ["BUGWK1 LEOPARD DEBUG : passes/text.html = PASS",
+             "BUGWK1 LEOPARD RELEASE : passes/text.html = TIMEOUT"],
+            "")
+
+
     def test_tab(self):
         self.assert_lines_lint(