Changeset 239344 in webkit

Timestamp:

Dec 18, 2018 11:42:55 AM (5 years ago)

Author:

Jonathan Bedard

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/port/device_port.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-12-18  Jonathan Bedard  <jbedard@apple.com>
+
+        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  <achristensen@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -242 +242 @@
                  "'always' == always skip, even if listed on the command line.")),
         optparse.make_option("--force", action="store_true", 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"),

trunk/Tools/Scripts/webkitpy/port/device_port.py

@@ -124 +124 @@
             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),
@@ -147 +151 @@
             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(