diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/style/checkers/test_expectations.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/style/checkers/test_expectations.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Tools/Scripts/webkitpy/style/checkers/test_expectations.py b/Tools/Scripts/webkitpy/style/checkers/test_expectations.py index 3b81132c3..46403b7db 100644 --- a/Tools/Scripts/webkitpy/style/checkers/test_expectations.py +++ b/Tools/Scripts/webkitpy/style/checkers/test_expectations.py @@ -49,11 +49,14 @@ class TestExpectationsChecker(object): def _determine_port_from_expectations_path(self, host, expectations_path): # Pass a configuration to avoid calling default_configuration() when initializing the port (takes 0.5 seconds on a Mac Pro!). - options = optparse.Values({'configuration': 'Release'}) + options_wk1 = optparse.Values({'configuration': 'Release', 'webkit_test_runner': False}) + options_wk2 = optparse.Values({'configuration': 'Release', 'webkit_test_runner': True}) for port_name in host.port_factory.all_port_names(): - port = host.port_factory.get(port_name, options=options) - if port.path_to_test_expectations_file().replace(port.path_from_webkit_base() + host.filesystem.sep, '') == expectations_path: - return port + ports = [host.port_factory.get(port_name, options=options_wk1), host.port_factory.get(port_name, options=options_wk2)] + for port in ports: + for test_expectation_file in port.expectations_files(): + if test_expectation_file.replace(port.path_from_webkit_base() + host.filesystem.sep, '') == expectations_path: + return port return None def __init__(self, file_path, handle_style_error, host=None): |