diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/style')
5 files changed, 11 insertions, 13 deletions
diff --git a/Tools/Scripts/webkitpy/style/checker.py b/Tools/Scripts/webkitpy/style/checker.py index ed0860cc0..5b11af483 100644 --- a/Tools/Scripts/webkitpy/style/checker.py +++ b/Tools/Scripts/webkitpy/style/checker.py @@ -572,7 +572,7 @@ class CheckerDispatcher(object): elif file_extension == _PNG_FILE_EXTENSION: return FileType.PNG elif ((not file_extension and os.path.join("Tools", "Scripts") in file_path) or - file_extension in _TEXT_FILE_EXTENSIONS): + file_extension in _TEXT_FILE_EXTENSIONS or os.path.basename(file_path) == 'TestExpectations'): return FileType.TEXT else: return FileType.NONE diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp.py b/Tools/Scripts/webkitpy/style/checkers/cpp.py index 45c49aab4..1e3f8767f 100644 --- a/Tools/Scripts/webkitpy/style/checkers/cpp.py +++ b/Tools/Scripts/webkitpy/style/checkers/cpp.py @@ -2425,7 +2425,7 @@ def check_for_comparisons_to_zero(clean_lines, line_number, error): line = clean_lines.elided[line_number] # Include NULL here so that users don't have to convert NULL to 0 first and then get this error. - if search(r'[=!]=\s*(NULL|0|true|false)\W', line) or search(r'\W(NULL|0|true|false)\s*[=!]=', line): + if search(r'[=!]=\s*(NULL|0|true|false)[^\w.]', line) or search(r'[^\w.](NULL|0|true|false)\s*[=!]=', line): if not search('LIKELY', line) and not search('UNLIKELY', line): error(line_number, 'readability/comparison_to_zero', 5, 'Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons.') diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py index a5a94b793..de99f5ed1 100644 --- a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py +++ b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py @@ -4376,6 +4376,12 @@ class WebKitStyleTest(CppStyleTestBase): 'if (UNLIKELY(foo == 0))', '') self.assert_lint( + 'if ((a - b) == 0.5)', + '') + self.assert_lint( + 'if (0.5 == (a - b))', + '') + self.assert_lint( 'if (LIKELY(foo == NULL))', 'Use 0 instead of NULL. [readability/null] [5]') self.assert_lint( diff --git a/Tools/Scripts/webkitpy/style/checkers/test_expectations.py b/Tools/Scripts/webkitpy/style/checkers/test_expectations.py index c95c4120f..3b81132c3 100644 --- a/Tools/Scripts/webkitpy/style/checkers/test_expectations.py +++ b/Tools/Scripts/webkitpy/style/checkers/test_expectations.py @@ -75,13 +75,9 @@ class TestExpectationsChecker(object): def _handle_error_message(self, lineno, message, confidence): pass - def check_test_expectations(self, expectations_str, tests=None, overrides=None): - # FIXME: we should pass in the filenames here if possible, and ensure - # that this works with with cascading expectations files and remove the overrides param. + def check_test_expectations(self, expectations_str, tests=None): parser = TestExpectationParser(self._port_obj, tests, False) expectations = parser.parse('expectations', expectations_str) - if overrides: - expectations += parser.parse('overrides', overrides) level = 5 for expectation_line in expectations: @@ -92,12 +88,9 @@ class TestExpectationsChecker(object): self._tab_checker.check(lines) def check(self, lines): - overrides = self._port_obj.test_expectations_overrides() expectations = '\n'.join(lines) if self._port_obj: - self.check_test_expectations(expectations_str=expectations, - tests=None, - overrides=overrides) + self.check_test_expectations(expectations_str=expectations, tests=None) else: self._handle_style_error(1, 'test/expectations', 5, 'No port uses path %s for test_expectations' % self._file_path) diff --git a/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py b/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py index 8cc91b1ac..8b53e6dfa 100644 --- a/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py +++ b/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py @@ -93,8 +93,7 @@ class TestExpectationsTestCase(unittest.TestCase): # Now use a test port so we can check the lines. checker._port_obj = host.port_factory.get('test-mac-leopard') checker.check_test_expectations(expectations_str='\n'.join(lines), - tests=[self._test_file], - overrides=None) + tests=[self._test_file]) checker.check_tabs(lines) if should_pass: self.assertEqual('', self._error_collector.get_errors()) |