Attachment 347925 Details for Bug 188280 – Patch for landing

[patch] Patch for landing

bug-188280-20180823090047.patch (text/plain), 4.44 KB, created by Jonathan Bedard on 2018-08-23 09:00:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-08-23 09:00:49 PDT

Size: 4.44 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235224)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-08-23  Jonathan Bedard  <jbedard@apple.com>
>+
>+        Explain test name matching in run-api-tests help
>+        https://bugs.webkit.org/show_bug.cgi?id=188280
>+
>+        Reviewed by Ryosuke Niwa.
>+
>+        Improve the run-api-tests help message to explain how test
>+        name matching works.
>+
>+        * Scripts/webkitpy/api_tests/run_api_tests.py:
>+        (parse_args):
>+        * Scripts/webkitpy/port/base.py:
>+        (Port):
>+        (Port.path_to_api_test_binaries): Make binary names a globally accessible array.
>+        * Scripts/webkitpy/port/win.py:
>+        (WinPort):
>+        (WinPort.path_to_api_test_binaries): Ditto.
>+
> 2018-08-23  Jonathan Bedard  <jbedard@apple.com>
> 
>         run-api-tests: Add --webkit-only, --webcore-only and --webkit-legacy-only options to run WebKit, WebCore and WebKitLegacy tests 
>Index: Tools/Scripts/webkitpy/api_tests/run_api_tests.py
>===================================================================
>--- Tools/Scripts/webkitpy/api_tests/run_api_tests.py	(revision 235224)
>+++ Tools/Scripts/webkitpy/api_tests/run_api_tests.py	(working copy)
>@@ -29,7 +29,7 @@ import traceback
> from webkitpy.api_tests.manager import Manager
> from webkitpy.common.host import Host
> from webkitpy.layout_tests.views.metered_stream import MeteredStream
>-from webkitpy.port import configuration_options, platform_options
>+from webkitpy.port import configuration_options, platform_options, base, win
> 
> EXCEPTIONAL_EXIT_STATUS = -1
> INTERRUPT_EXIT_STATUS = -2
>@@ -133,7 +133,16 @@ def parse_args(args):
>                              help='Run all tests, even DISABLED tests'),
>     ]))
> 
>-    option_parser = optparse.OptionParser(usage='%prog [options] [<path>...]')
>+    option_parser = optparse.OptionParser(
>+        usage='run-api-tests [options] [<test names>...]',
>+        description="""By default, run-api-tests will run all API tests. It also allows the user to specify tests of the \
>+format <suite>.<test> or <canonicalized binary name>.<suite>.<test>. Note that in the case where a binary is not \
>+specified, one will be inferred by listing all available tests. Specifying just a binary or just a suite will cause every \
>+test contained within to be run. The canonicalized binary name is the binary name with any filename extension \
>+stripped. For Unix ports, these binaries are {} and {}. For Windows ports, they are {} and {}.""".format(
>+            ', '.join(base.Port.API_TEST_BINARY_NAMES[:-1]), base.Port.API_TEST_BINARY_NAMES[-1],
>+            ', '.join(win.WinPort.API_TEST_BINARY_NAMES[:-1]), win.WinPort.API_TEST_BINARY_NAMES[-1],
>+    ))
> 
>     for group_name, group_options in option_group_definitions:
>         option_group = optparse.OptionGroup(option_parser, group_name)
>Index: Tools/Scripts/webkitpy/port/base.py
>===================================================================
>--- Tools/Scripts/webkitpy/port/base.py	(revision 235224)
>+++ Tools/Scripts/webkitpy/port/base.py	(working copy)
>@@ -1373,8 +1373,10 @@ class Port(object):
>         This is likely used only by diff_image()"""
>         return self._build_path('ImageDiff')
> 
>+    API_TEST_BINARY_NAMES = ['TestWTF', 'TestWebKitAPI']
>+
>     def path_to_api_test_binaries(self):
>-        return {binary: self._build_path(binary) for binary in ['TestWTF', 'TestWebKitAPI']}
>+        return {binary: self._build_path(binary) for binary in self.API_TEST_BINARY_NAMES}
> 
>     def _path_to_lighttpd(self):
>         """Returns the path to the LigHTTPd binary.
>Index: Tools/Scripts/webkitpy/port/win.py
>===================================================================
>--- Tools/Scripts/webkitpy/port/win.py	(revision 235224)
>+++ Tools/Scripts/webkitpy/port/win.py	(working copy)
>@@ -212,8 +212,10 @@ class WinPort(ApplePort):
> 
>         return self._build_path('ImageDiff.exe')
> 
>+    API_TEST_BINARY_NAMES = ['TestWTF.exe', 'TestWebCore.exe', 'TestWebKitLegacy.exe']
>+
>     def path_to_api_test_binaries(self):
>-        return {binary.split('.')[0]: self._build_path(binary) for binary in ['TestWTF.exe', 'TestWebCore.exe', 'TestWebKitLegacy.exe']}
>+        return {binary.split('.')[0]: self._build_path(binary) for binary in self.API_TEST_BINARY_NAMES}
> 
>     def test_search_path(self):
>         test_fallback_names = [path for path in self.baseline_search_path() if not path.startswith(self._webkit_baseline_path('mac'))]

Actions: View | Formatted Diff | Diff

Attachments on bug 188280: 346424 | 346466 | 347553 | 347744 | 347925