Title: [246221] trunk/Tools
- Revision
- 246221
- Author
- [email protected]
- Date
- 2019-06-07 15:50:10 -0700 (Fri, 07 Jun 2019)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (246220 => 246221)
--- trunk/Tools/ChangeLog 2019-06-07 22:43:24 UTC (rev 246220)
+++ trunk/Tools/ChangeLog 2019-06-07 22:50:10 UTC (rev 246221)
@@ -1,3 +1,20 @@
+2019-06-07 Jonathan Bedard <[email protected]>
+
+ 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 <[email protected]>
[iOS] At least 6 API tests are failing due to an exception when writing NSAttributedString to the pasteboard
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (246220 => 246221)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2019-06-07 22:43:24 UTC (rev 246220)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2019-06-07 22:50:10 UTC (rev 246221)
@@ -268,7 +268,8 @@
return test_run_results.RunDetails(exit_code=-1)
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)
if self._options.report_urls:
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (246220 => 246221)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-06-07 22:43:24 UTC (rev 246220)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-06-07 22:50:10 UTC (rev 246221)
@@ -1597,6 +1597,7 @@
architecture=configuration.architecture,
style=style,
sdk=host.platform.build_version(),
+ flavor=self.get_option('result_report_flavor'),
)
@memoized
Modified: trunk/Tools/Scripts/webkitpy/results/options.py (246220 => 246221)
--- trunk/Tools/Scripts/webkitpy/results/options.py 2019-06-07 22:43:24 UTC (rev 246220)
+++ trunk/Tools/Scripts/webkitpy/results/options.py 2019-06-07 22:50:10 UTC (rev 246221)
@@ -30,4 +30,5 @@
optparse.make_option('--builder-name', help='The name of the buildbot builder tests were run on.'),
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.'),
]
Modified: trunk/Tools/Scripts/webkitpy/test/main.py (246220 => 246221)
--- trunk/Tools/Scripts/webkitpy/test/main.py 2019-06-07 22:43:24 UTC (rev 246220)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2019-06-07 22:50:10 UTC (rev 246221)
@@ -263,6 +263,7 @@
version_name=_host.platform.os_version_name(),
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),
commits=[Upload.create_commit(
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
