Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 550aa9dc7a1bcd415e3e3369ca9a4d951f66adf8
https://github.com/WebKit/WebKit/commit/550aa9dc7a1bcd415e3e3369ca9a4d951f66adf8
Author: Jonathan Bedard <[email protected]>
Date: 2026-03-30 (Mon, 30 Mar 2026)
Changed paths:
M LayoutTests/fast/harness/results.html
M Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
M Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py
M Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
M Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
M Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
M Tools/Scripts/webkitpy/port/base.py
M Tools/Scripts/webkitpy/port/ios.py
M Tools/Scripts/webkitpy/port/mac.py
Log Message:
-----------
[run-webkit-tests] Run wk1 and wk2 tests in a single invocation
https://bugs.webkit.org/show_bug.cgi?id=305658
rdar://168316737
Rubber-stamped by Aakash Jain.
On macOS, run both wk1 and wk2 tests when run-webkit-tests is invoked.
* LayoutTests/fast/harness/results.html: Support multiple drivers.
* Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager.__init__): Differentiate the active port with a "base" port.
(Manager._compute_subdirectories): Return a dictionary mapping of results
directories for the set of supported drivers. If only one driver is being
tested, there are no subdirectories.
(Manager._create_port_for_driver): Create a driver from the base port
suporting a specific driver.
(Manager._collect_tests): Differentiate test collection by driver.
(Manager._tests_to_run): Differentiate test expectations by driver.
(Manager._test_is_slow): Ditto.
(Manager._test_should_dump_jsconsolelog_in_stderr): Ditto.
(Manager.run): Run test for each provided driver.
(Manager._end_test_run):
(Manager._run_tests): Differentiate test expectations by driver.
(Manager._save_json_files): Point results.html to a test subdirectory, if
one exists.
(Manager._print_expectation_line_for_test): Differentiate test expectations by
driver.
(Manager.print_expectations): Ditto.
(Manager.print_summary): Handle results from multiple drivers.
(Manager.print_summary._increment_stat):
(Manager.print_summary._should_include_dir_in_report):
* Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
(ManagerTest._get_manager): Explicitly specify driver in tests.
* Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py:
(TestRunResults.merge): Handle SKIP results mixing with with other results from
different drivers.
* Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(main): Support multiple drivers.
(parse_args): Ditto.
(_set_up_derived_options):
(_print_expectations): Deleted.
* Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(RunTest.test_device_type_specific_listing): Rebaselined.
(RunTest.test_ipad_listing): Rebaselined.
* Tools/Scripts/webkitpy/port/base.py:
(Port.__init__): Support multipel drivers.
* Tools/Scripts/webkitpy/port/ios.py:
(IOSPort): Only use WebKitTestRunenr as a driver.
* Tools/Scripts/webkitpy/port/mac.py:
(MacPort): Use both WebKitTestRunner and DumpRenderTree as drivers.
Canonical link: https://commits.webkit.org/310228@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
