Attachment 371607 Details for Bug 198662 – Patch

[patch] Patch

bug-198662-20190607134321.patch (text/plain), 4.36 KB, created by Jonathan Bedard on 2019-06-07 13:43:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-06-07 13:43:22 PDT

Size: 4.36 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246206)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2019-06-07  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Support reporting results for exotic test configurations
>+        https://bugs.webkit.org/show_bug.cgi?id=198662
>+        <rdar://problem/51524128>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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>
> 
>         [iOS] At least 6 API tests are failing due to an exception when writing NSAttributedString to the pasteboard
>Index: Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
>===================================================================
>--- Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	(revision 246202)
>+++ Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	(working copy)
>@@ -268,7 +268,8 @@ class Manager(object):
>                 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:
>Index: Tools/Scripts/webkitpy/port/base.py
>===================================================================
>--- Tools/Scripts/webkitpy/port/base.py	(revision 246202)
>+++ Tools/Scripts/webkitpy/port/base.py	(working copy)
>@@ -1597,6 +1597,7 @@ class Port(object):
>             architecture=configuration.architecture,
>             style=style,
>             sdk=host.platform.build_version(),
>+            flavor=self.get_option('result_report_flavor'),
>         )
> 
>     @memoized
>Index: Tools/Scripts/webkitpy/results/options.py
>===================================================================
>--- Tools/Scripts/webkitpy/results/options.py	(revision 246202)
>+++ Tools/Scripts/webkitpy/results/options.py	(working copy)
>@@ -30,4 +30,5 @@ def upload_options():
>         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.'),
>     ]
>Index: Tools/Scripts/webkitpy/test/main.py
>===================================================================
>--- Tools/Scripts/webkitpy/test/main.py	(revision 246202)
>+++ Tools/Scripts/webkitpy/test/main.py	(working copy)
>@@ -263,6 +263,7 @@ class Tester(object):
>                     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(
>@@ -277,6 +278,7 @@ class Tester(object):
>                 ),
>                 results=results,
>             )
>+            print json.dumps(upload.configuration)
>             for url in self._options.report_urls:
>                 self.printer.write_update('Uploading to {} ...'.format(url))
>                 failed_uploads = failed_uploads if upload.upload(url, log_line_func=self.printer.meter.writeln) else (failed_uploads + 1)

Actions: View | Formatted Diff | Diff

Attachments on bug 198662: 371593 | 371607 | 371611