Title: [239344] trunk/Tools
- Revision
- 239344
- Author
- [email protected]
- Date
- 2018-12-18 11:42:55 -0800 (Tue, 18 Dec 2018)
Log Message
webkitpy: Ignore device type for test when using --force
https://bugs.webkit.org/show_bug.cgi?id=192786
<rdar://problem/46794894>
Reviewed by Daniel Bates.
It is sometimes the case that a contributor will wish to run a test on a specific device,
despite expectations which indicate a test should not be run on that device.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(parse_args):
* Scripts/webkitpy/port/device_port.py:
(DevicePort.default_child_processes): Strip device type information when using --force.
(DevicePort.setup_test_run): Only allow incomplete match when using --force.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (239343 => 239344)
--- trunk/Tools/ChangeLog 2018-12-18 19:18:44 UTC (rev 239343)
+++ trunk/Tools/ChangeLog 2018-12-18 19:42:55 UTC (rev 239344)
@@ -1,3 +1,20 @@
+2018-12-18 Jonathan Bedard <[email protected]>
+
+ webkitpy: Ignore device type for test when using --force
+ https://bugs.webkit.org/show_bug.cgi?id=192786
+ <rdar://problem/46794894>
+
+ Reviewed by Daniel Bates.
+
+ It is sometimes the case that a contributor will wish to run a test on a specific device,
+ despite expectations which indicate a test should not be run on that device.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (parse_args):
+ * Scripts/webkitpy/port/device_port.py:
+ (DevicePort.default_child_processes): Strip device type information when using --force.
+ (DevicePort.setup_test_run): Only allow incomplete match when using --force.
+
2018-12-18 Alex Christensen <[email protected]>
WKWebView has old URL while displaying SafeBrowsing interstitial, for link-click navigations
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (239343 => 239344)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2018-12-18 19:18:44 UTC (rev 239343)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2018-12-18 19:42:55 UTC (rev 239344)
@@ -241,7 +241,8 @@
"'only' == only run the SKIP tests, "
"'always' == always skip, even if listed on the command line.")),
optparse.make_option("--force", action="" default=False,
- help="Run all tests with PASS as expected result, even those marked SKIP in the test list (implies --skipped=ignore)"),
+ help="Run all tests with PASS as expected result, even those marked SKIP in the test list or " + \
+ "those which are device-specific (implies --skipped=ignore)"),
optparse.make_option("--time-out-ms",
help="Set the timeout for each test"),
optparse.make_option("--order", action="" default="natural",
Modified: trunk/Tools/Scripts/webkitpy/port/device_port.py (239343 => 239344)
--- trunk/Tools/Scripts/webkitpy/port/device_port.py 2018-12-18 19:18:44 UTC (rev 239343)
+++ trunk/Tools/Scripts/webkitpy/port/device_port.py 2018-12-18 19:42:55 UTC (rev 239344)
@@ -123,6 +123,10 @@
if device_type.software_variant and self.DEFAULT_DEVICE_TYPE.software_variant != device_type.software_variant:
return 0
+ if self.get_option('force'):
+ device_type.hardware_family = None
+ device_type.hardware_type = None
+
return self.DEVICE_MANAGER.device_count_for_type(
self._device_type_with_version(device_type),
host=self.host,
@@ -146,7 +150,7 @@
device_type,
use_booted_simulator=not self.get_option('dedicated_simulators', False),
use_existing_simulator=False,
- allow_incomplete_match=True,
+ allow_incomplete_match=self.get_option('force'),
)
self.DEVICE_MANAGER.initialize_devices(
[request] * self.child_processes(),
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
