Changeset 138314 in webkit
- Timestamp:
- Dec 20, 2012 4:04:40 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r138305 r138314 1 2012-12-20 Dirk Pranke <dpranke@chromium.org> 2 3 TestExpectation fallback is broken 4 https://bugs.webkit.org/show_bug.cgi?id=105583 5 6 Reviewed by Ryosuke Niwa. 7 8 When I added support for the -wk2 in port names, it looks 9 like I broke the way we computed the list of TestExpectations 10 files so that the implementation-version directory was left out :(. 11 Fixed and cleaned up the tests. 12 13 * Scripts/webkitpy/layout_tests/port/base.py: 14 (Port.expectations_files): 15 * Scripts/webkitpy/layout_tests/port/port_testcase.py: 16 (TestWebKitPort.__init__): 17 (PortTestCase.test_skipped_directories_for_symbols): 18 (test_skipped_directories_for_features): 19 (test_skipped_directories_for_features_no_matching_tests_in_test_list): 20 (test_skipped_tests_for_unsupported_features_empty_test_list): 21 (test_skipped_layout_tests): 22 (test_expectations_files): 23 1 24 2012-12-20 Anders Carlsson <andersca@apple.com> 2 25 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py
r138045 r138314 1072 1072 # included via --additional-platform-directory, not the full casade. 1073 1073 search_paths = [self.port_name] 1074 if self.name() != self.port_name: 1075 search_paths.append(self.name()) 1074 1075 non_wk2_name = self.name().replace('-wk2', '') 1076 if non_wk2_name != self.port_name: 1077 search_paths.append(non_wk2_name) 1076 1078 1077 1079 if self.get_option('webkit_test_runner'): 1078 1080 # Because nearly all of the skipped tests for WebKit 2 are due to cross-platform 1079 1081 # issues, all wk2 ports share a skipped list under platform/wk2. 1080 search_paths.extend([ self._wk2_port_name(), "wk2"])1082 search_paths.extend(["wk2", self._wk2_port_name()]) 1081 1083 1082 1084 search_paths.extend(self.get_option("additional_platform_directory", [])) -
trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
r137781 r138314 51 51 port_name = "testwebkitport" 52 52 53 def __init__(self, symbols_string=None,53 def __init__(self, port_name=None, symbols_string=None, 54 54 expectations_file=None, skips_file=None, host=None, config=None, 55 55 **kwargs): 56 port_name = port_name or TestWebKitPort.port_name 56 57 self.symbols_string = symbols_string # Passing "" disables all staticly-detectable features. 57 58 host = host or MockSystemHost() 58 super(TestWebKitPort, self).__init__(host, TestWebKitPort.port_name, **kwargs)59 super(TestWebKitPort, self).__init__(host, port_name=port_name, **kwargs) 59 60 60 61 def all_test_configurations(self): … … 463 464 ]) 464 465 465 result_directories = set(TestWebKitPort(symbols_string , None)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))466 result_directories = set(TestWebKitPort(symbols_string=symbols_string)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html'])) 466 467 self.assertEqual(result_directories, expected_directories) 467 468 … … 474 475 # Note 'compositing' is not in the list of skipped directories (hence the parsing of GraphicsLayer worked): 475 476 expected_directories = set(['mathml', 'transforms/3d', 'compositing/webgl', 'fast/canvas/webgl', 'animations/3d', 'mhtml', 'http/tests/canvas/webgl', 'fast/css/variables', 'inspector/styles/variables']) 476 result_directories = set(TestWebKitPort(symbols_string , None)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))477 result_directories = set(TestWebKitPort(symbols_string=symbols_string)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html'])) 477 478 self.assertEqual(result_directories, expected_directories) 478 479 … … 480 481 supported_features = ["Accelerated Compositing", "Foo Feature"] 481 482 expected_directories = set(["animations/3d", "transforms/3d"]) 482 port = TestWebKitPort( None,supported_features)483 port = TestWebKitPort(supported_features=supported_features) 483 484 port._runtime_feature_list = lambda: supported_features 484 485 result_directories = set(port._skipped_tests_for_unsupported_features(test_list=["animations/3d/foo.html"])) … … 488 489 supported_features = ["Accelerated Compositing", "Foo Feature"] 489 490 expected_directories = set([]) 490 result_directories = set(TestWebKitPort( None,supported_features)._skipped_tests_for_unsupported_features(test_list=['foo.html']))491 result_directories = set(TestWebKitPort(supported_features=supported_features)._skipped_tests_for_unsupported_features(test_list=['foo.html'])) 491 492 self.assertEqual(result_directories, expected_directories) 492 493 … … 494 495 supported_features = ["Accelerated Compositing", "Foo Feature"] 495 496 expected_directories = set([]) 496 result_directories = set(TestWebKitPort( None,supported_features)._skipped_tests_for_unsupported_features(test_list=None))497 result_directories = set(TestWebKitPort(supported_features=supported_features)._skipped_tests_for_unsupported_features(test_list=None)) 497 498 self.assertEqual(result_directories, expected_directories) 498 499 499 500 def test_skipped_layout_tests(self): 500 self.assertEqual(TestWebKitPort( None, None).skipped_layout_tests(test_list=[]), set(['media']))501 self.assertEqual(TestWebKitPort().skipped_layout_tests(test_list=[]), set(['media'])) 501 502 502 503 def test_expectations_files(self): … … 508 509 self.assertEqual(platform_dirs(port), ['testwebkitport']) 509 510 510 port ._name = "testwebkitport-version"511 port = TestWebKitPort(port_name="testwebkitport-version") 511 512 self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version']) 512 513 513 port._options = MockOptions(webkit_test_runner=True) 514 self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'testwebkitport-wk2', 'wk2']) 515 516 port._options = MockOptions(additional_platform_directory=["internal-testwebkitport"]) 514 port = TestWebKitPort(port_name="testwebkitport-version-wk2") 515 self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'wk2', 'testwebkitport-wk2']) 516 517 port = TestWebKitPort(port_name="testwebkitport-version", 518 options=MockOptions(additional_platform_directory=["internal-testwebkitport"])) 517 519 self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'internal-testwebkitport']) 518 520
Note: See TracChangeset
for help on using the changeset viewer.