Attachment 339036 Details for Bug 185094 – Patch

[patch] Patch

bug-185094-20180427160934.patch (text/plain), 3.70 KB, created by Ross Kirsling on 2018-04-27 16:09:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-04-27 16:09:35 PDT

Size: 3.70 KB

patch

obsolete

>Subversion Revision: 231111
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7dc32fbb5e067ee1a9d2181848698c20abfc9ae3..83d470dccd090f958cd30bc2de8236eb2769ff9f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-04-27  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [WinCairo] Align buildbot test stages with AppleWin.
>+        https://bugs.webkit.org/show_bug.cgi?id=185094
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/build.webkit.org-config/factories.py:
>+        (TestFactory.__init__):
>+        Do run API tests, don't run dashboard tests.
>+
>+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
>+        (RunUnitTests):
>+        Call run-api-tests with Python, not Perl (bugfix for r230998).
>+
>+        * Scripts/webkitpy/port/win.py:
>+        (WinPort.environment_for_api_tests):
>+        Retrieve necessary Windows environment variables.
>+
> 2018-04-27  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [Extra zoom mode] Add a mechanism to override default viewport behaviors in extra zoom mode
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py b/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
>index 61de0cdbc14cce04723442c9cb36ecf9f931db8e..20e65b156426cf4b42a4da2516fb435cd18ce379 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
>@@ -80,13 +80,13 @@ class TestFactory(Factory):
>         if self.LayoutTestClass:
>             self.addStep(self.LayoutTestClass())
> 
>-        if platform == 'win' or platform.startswith('mac') or platform.startswith('ios-simulator'):
>+        if platform.startswith('win') or platform.startswith('mac') or platform.startswith('ios-simulator'):
>             self.addStep(RunUnitTests())
>         self.addStep(RunPythonTests())
>         self.addStep(RunPerlTests())
>         self.addStep(RunBindingsTests())
>         self.addStep(RunBuiltinsTests())
>-        if platform != 'win':
>+        if not platform.startswith('win'):
>             self.addStep(RunDashboardTests())
>         if self.LayoutTestClass:
>             self.addStep(ArchiveTestResults())
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>index d1c65711928ed34d52aec537f4ea65bd56cc400a..3c2eb1601df0fd8b2e64c73c0763a32995a7e850 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>@@ -489,7 +489,7 @@ class RunUnitTests(TestWithFailureCount):
>     name = "run-api-tests"
>     description = ["unit tests running"]
>     descriptionDone = ["unit-tests"]
>-    command = ["perl", "./Tools/Scripts/run-api-tests", "--no-build", WithProperties("--%(configuration)s"), "--verbose"]
>+    command = ["python", "./Tools/Scripts/run-api-tests", "--no-build", WithProperties("--%(configuration)s"), "--verbose"]
>     failedTestsFormatString = "%d unit test%s failed or timed out"
> 
>     def start(self):
>diff --git a/Tools/Scripts/webkitpy/port/win.py b/Tools/Scripts/webkitpy/port/win.py
>index 4a3d453be12e3a3f43c0b0282ceaf8b13071acba..f0e8f8b20a7391fb440e24e7e02076604c8bd3ce 100644
>--- a/Tools/Scripts/webkitpy/port/win.py
>+++ b/Tools/Scripts/webkitpy/port/win.py
>@@ -137,6 +137,12 @@ class WinPort(ApplePort):
>         env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
>         return env
> 
>+    def environment_for_api_tests(self):
>+        env = super(WinPort, self).environment_for_api_tests()
>+        for variable in ['SYSTEMROOT', 'WEBKIT_LIBRARIES']:
>+            self._copy_value_from_environ_if_set(env, variable)
>+        return env
>+
>     def operating_system(self):
>         return 'win'
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185094: 339036