Changeset 246221 in webkit

Timestamp:

Jun 7, 2019 3:50:10 PM (5 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Support reporting results for uncommon test configurations
​https://bugs.webkit.org/show_bug.cgi?id=198662
<rdar://problem/51524128>

Reviewed by Aakash Jain.

• Scripts/webkitpy/layout_tests/controllers/manager.py:

(Manager.run): Override wk1 and wk2 flavors with specified flavor.

• Scripts/webkitpy/port/base.py:

(Port.configuration_for_upload): Set flavor based on options.

• Scripts/webkitpy/results/options.py:

(upload_options): Add result-report-flavor option.

• Scripts/webkitpy/test/main.py:

(Tester._run_tests): Set flavor based on options.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/results/options.py (modified) (1 diff)
• Scripts/webkitpy/test/main.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-07  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Support reporting results for uncommon test configurations
+        https://bugs.webkit.org/show_bug.cgi?id=198662
+        <rdar://problem/51524128>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager.run): Override wk1 and wk2 flavors with specified flavor.
+        * Scripts/webkitpy/port/base.py:
+        (Port.configuration_for_upload): Set flavor based on options.
+        * Scripts/webkitpy/results/options.py:
+        (upload_options): Add result-report-flavor option.
+        * Scripts/webkitpy/test/main.py:
+        (Tester._run_tests): Set flavor based on options.
+
 2019-06-07  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -269 +269 @@
 
             configuration = self._port.configuration_for_upload(self._port.target_host(0))
-            configuration['flavor'] = 'wk2' if self._options.webkit_test_runner else 'wk1'
+            if not configuration.get('flavor', None):  # The --result-report-flavor argument should override wk1/wk2
+                configuration['flavor'] = 'wk2' if self._options.webkit_test_runner else 'wk1'
             temp_initial_results, temp_retry_results, temp_enabled_pixel_tests_in_retry = self._run_test_subset(tests_to_run_by_device[device_type], tests_to_skip, device_type=device_type)
 

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

@@ -1598 +1598 @@
             style=style,
             sdk=host.platform.build_version(),
+            flavor=self.get_option('result_report_flavor'),
         )
 

trunk/Tools/Scripts/webkitpy/results/options.py

@@ -31 +31 @@
         optparse.make_option('--build-number', help='The buildbot build number tests are associated with.'),
         optparse.make_option('--buildbot-worker', help='The buildbot worker tests were run on.'),
+        optparse.make_option('--result-report-flavor', help='Optional flag for categorizing test runs which do not fit into other configuration options.'),
     ]

trunk/Tools/Scripts/webkitpy/test/main.py

@@ -264 +264 @@
                     style='asan' if config.asan else configuration_to_use,
                     sdk=_host.platform.build_version(),
+                    flavor=self._options.result_report_flavor,
                 ),
                 details=Upload.create_details(options=self._options),