Attachment 339377 Details for Bug 185234 – Patch

[patch] Patch

bug-185234.diff (text/plain), 6.46 KB, created by Don Olmstead on 2018-05-02 19:10:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-05-02 19:10:41 PDT

Size: 6.46 KB

patch

obsolete

>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>index 960e75acd58..9aa0f0e7b79 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>@@ -57,9 +57,11 @@
>                     { "name": "wincairo-wkl-release-build-01", "platform": "wincairo" },
>                     { "name": "wincairo-wkl-release-tests-01", "platform": "wincairo" },
>                     { "name": "wincairo-wkl-release-tests-02", "platform": "wincairo" },
>+                    { "name": "wincairo-jsc-release-tests-01", "platform": "wincairo" },
>                     { "name": "wincairo-wkl-debug-build-01", "platform": "wincairo" },
>                     { "name": "wincairo-wkl-debug-tests-01", "platform": "wincairo" },
>                     { "name": "wincairo-wkl-debug-tests-02", "platform": "wincairo" },
>+                    { "name": "wincairo-jsc-debug-tests-01", "platform": "wincairo" },
> 
>                     { "name": "gtk-linux-slave-1", "platform": "gtk" },
>                     { "name": "gtk-linux-slave-2", "platform": "gtk" },
>@@ -295,25 +297,35 @@
>                     {
>                       "name": "WinCairo 64-bit WKL Release (Build)", "type": "Build", "builddir": "wincairo-wkl-release",
>                       "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
>-                      "triggers": ["wincairo-wkl-release-tests"],
>+                      "triggers": ["wincairo-wkl-release-tests", "wincairo-jsc-release-tests"],
>                       "slavenames": ["wincairo-wkl-release-build-01"]
>                     },
>                     {
>-                      "name": "WinCairo 64-bit WKL Release (Tests)", "type": "TestWebKit1", "builddir": "wincairo-wkl-release-tests",
>+                      "name": "WinCairo 64-bit WKL Release (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "wincairo-wkl-release-tests",
>                       "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
>                       "slavenames": ["wincairo-wkl-release-tests-01", "wincairo-wkl-release-tests-02"]
>                     },
>+                    {
>+                      "name": "WinCairo 64-bit JSC Release (Tests)", "type": "TestJSC", "builddir": "wincairo-jsc-release-tests",
>+                      "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
>+                      "slavenames": ["wincairo-jsc-release-tests-01"]
>+                    },
>                     {
>                       "name": "WinCairo 64-bit WKL Debug (Build)", "type": "Build", "builddir": "wincairo-wkl-debug",
>                       "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
>-                      "triggers": ["wincairo-wkl-debug-tests"],
>+                      "triggers": ["wincairo-wkl-debug-tests", "wincairo-jsc-debug-tests"],
>                       "slavenames": ["wincairo-wkl-debug-build-01"]
>                     },
>                     {
>-                      "name": "WinCairo 64-bit WKL Debug (Tests)", "type": "TestWebKit1", "builddir": "wincairo-wkl-debug-tests",
>+                      "name": "WinCairo 64-bit WKL Debug (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "wincairo-wkl-debug-tests",
>                       "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
>                       "slavenames": ["wincairo-wkl-debug-tests-01", "wincairo-wkl-debug-tests-02"]
>                     },
>+                    {
>+                      "name": "WinCairo 64-bit JSC Debug (Tests)", "type": "TestJSC", "builddir": "wincairo-jsc-debug-tests",
>+                      "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
>+                      "slavenames": ["wincairo-jsc-debug-tests-01"]
>+                    },
>                     {
>                       "name": "JSCOnly Linux AArch64 Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-aarch64-release",
>                       "platform": "jsc-only", "configuration": "release", "architectures": ["aarch64"],
>@@ -449,9 +461,15 @@
>                     { "type": "Triggerable", "name": "wincairo-wkl-release-tests",
>                       "builderNames": ["WinCairo 64-bit WKL Release (Tests)"]
>                     },
>+                    { "type": "Triggerable", "name": "wincairo-jsc-release-tests",
>+                      "builderNames": ["WinCairo 64-bit JSC Release (Tests)"]
>+                    },
>                     { "type": "Triggerable", "name": "wincairo-wkl-debug-tests",
>                       "builderNames": ["WinCairo 64-bit WKL Debug (Tests)"]
>                     },
>+                    { "type": "Triggerable", "name": "wincairo-jsc-debug-tests",
>+                      "builderNames": ["WinCairo 64-bit JSC Debug (Tests)"]
>+                    },
>                     { "type": "Triggerable", "name": "wpe-linux-64-release-tests",
>                       "builderNames": ["WPE Linux 64-bit Release (Tests)"]
>                     },
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>index e41b957c699..cef7454e9ff 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>@@ -329,7 +329,7 @@ class RunJavaScriptCoreTests(TestWithFailureCount):
>             self.setCommand(self.command + ['--memory-limited'])
>         # WinCairo uses the Windows command prompt, not Cygwin.
>         elif platform == 'wincairo':
>-            self.setCommand(self.command + ['--ruby-runner', '--test-writer=ruby'])
>+            self.setCommand(self.command + ['--test-writer=ruby'])
> 
>         appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
>         return shell.Test.start(self)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index aad886f792e..d2bf9b2547b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-02  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [WinCairo] Add JSC test bots
>+        https://bugs.webkit.org/show_bug.cgi?id=185234
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/build.webkit.org-config/config.json:
>+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
>+        (RunJavaScriptCoreTests.start):
>+
> 2018-05-02  Aditya Keerthi  <akeerthi@apple.com>
> 
>         Can't copy and paste URLs that have no title into Mail (macOS)

Actions: View | Formatted Diff | Diff

Attachments on bug 185234: 339377 | 339384