Attachment 373403 Details for Bug 199234 – Patch for landing

[patch] Patch for landing

enable-gtk-wpe.patch (text/plain), 9.02 KB, created by Aakash Jain on 2019-07-03 11:34:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2019-07-03 11:34:24 PDT

Size: 9.02 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 247095)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-07-03  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] Enable WPE and GTK queues on new EWS
>+        https://bugs.webkit.org/show_bug.cgi?id=199234
>+
>+        Reviewed by Jonathan Bedard.
>+
>+        * BuildSlaveSupport/ews-build/config.json: Enabled the triggers for GTK and WPE builders.
>+        * BuildSlaveSupport/ews-build/factories.py: Added required build steps for GTKFactory and WPEFactory.
>+        * BuildSlaveSupport/ews-build/steps.py:
>+        (CompileWebKit.evaluateCommand): Added InstallGtkDependencies/InstallWpeDependencies step before Compiling WebKit without patch.
>+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
>+        * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
>+        (StatusBubble): Enable gtk and wpe status-bubbles.
>+
> 2019-07-03  Aakash Jain  <aakash_jain@apple.com>
> 
>         Unreviewed follow-up fix to r247049, default the platform to '*' when platform property is not set.
>Index: Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py	(revision 247095)
>+++ Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py	(working copy)
>@@ -39,9 +39,9 @@ import ews.config as config
> class StatusBubble(View):
>     # These queue names are from shortname in https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/config.json
>     # FIXME: Auto-generate this list https://bugs.webkit.org/show_bug.cgi?id=195640
>-    ALL_QUEUES = ['ios', 'api-ios', 'api-mac', 'bindings', 'gtk', 'ios-sim', 'ios-wk2', 'jsc', 'mac', 'mac-32bit', 'mac-32bit-wk2',
>-                    'mac-debug', 'mac-debug-wk1', 'mac-wk1', 'mac-wk2', 'style', 'webkitperl', 'webkitpy', 'win', 'wincairo', 'wpe']
>-    ENABLED_QUEUES = ['ios', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy']
>+    ALL_QUEUES = ['ios', 'gtk', 'wpe', 'api-ios', 'api-mac', 'bindings', 'ios-sim', 'ios-wk2', 'jsc', 'mac', 'mac-32bit', 'mac-32bit-wk2',
>+                    'mac-debug', 'mac-debug-wk1', 'mac-wk1', 'mac-wk2', 'style', 'webkitperl', 'webkitpy', 'win', 'wincairo']
>+    ENABLED_QUEUES = ['ios', 'gtk', 'wpe', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy']
>     # FIXME: Auto-generate the queue's trigger relationship
>     QUEUE_TRIGGERS = {
>         'api-ios': 'ios-sim',
>Index: Tools/BuildSlaveSupport/ews-build/config.json
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/config.json	(revision 247095)
>+++ Tools/BuildSlaveSupport/ews-build/config.json	(working copy)
>@@ -454,16 +454,15 @@
>       "type": "Try_Userpass",
>       "name": "try",
>       "port": 5555,
>-      "builderNames": ["Bindings-Tests-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
>-                       "macOS-High-Sierra-Release-Build-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS"]
>+      "builderNames": ["Bindings-Tests-EWS", "GTK-Webkit2-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
>+                       "macOS-High-Sierra-Release-Build-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WPE-EWS"]
>     },
>     {
>       "type": "Try_Userpass",
>       "name": "disabled",
>       "port": 5556,
>-      "builderNames": ["GTK-Webkit2-EWS", "JSC-Tests-EWS",
>-                       "iOS-12-Simulator-WK2-Tests-EWS", "macOS-High-Sierra-Release-WK2-Tests-EWS",  "macOS-High-Sierra-Release-WK1-Tests-EWS",
>-                       "macOS-High-Sierra-Debug-Build-EWS", "Style-EWS", "WinCairo-EWS", "Windows-EWS", "WPE-EWS"]
>+      "builderNames": ["JSC-Tests-EWS", "iOS-12-Simulator-WK2-Tests-EWS", "macOS-High-Sierra-Release-WK2-Tests-EWS",
>+                       "macOS-High-Sierra-Release-WK1-Tests-EWS", "macOS-High-Sierra-Debug-Build-EWS", "Style-EWS", "WinCairo-EWS", "Windows-EWS"]
>     },
>     {
>       "type": "Triggerable",
>Index: Tools/BuildSlaveSupport/ews-build/factories.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/factories.py	(revision 247095)
>+++ Tools/BuildSlaveSupport/ews-build/factories.py	(working copy)
>@@ -26,7 +26,7 @@ from buildbot.steps import trigger
> 
> from steps import (ApplyPatch, CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance,
>                    CheckStyle, CompileJSCOnly, CompileJSCOnlyToT, CompileWebKit, ConfigureBuild,
>-                   DownloadBuiltProduct, ExtractBuiltProduct, KillOldProcesses,
>+                   DownloadBuiltProduct, ExtractBuiltProduct, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
>                    PrintConfiguration, ReRunJavaScriptCoreTests, RunAPITests, RunBindingsTests,
>                    RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests, RunWebKitPerlTests,
>                    RunWebKitPyTests, RunWebKitTests, UnApplyPatchIfRequired, ValidatePatch)
>@@ -112,10 +112,6 @@ class APITestsFactory(TestFactory):
>     APITestClass = RunAPITests
> 
> 
>-class GTKFactory(Factory):
>-    pass
>-
>-
> class iOSBuildFactory(BuildFactory):
>     pass
> 
>@@ -144,5 +140,17 @@ class WinCairoFactory(Factory):
>     pass
> 
> 
>+class GTKFactory(Factory):
>+    def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
>+        Factory.__init__(self, platform, configuration, architectures, True, triggers, additionalArguments)
>+        self.addStep(KillOldProcesses())
>+        self.addStep(InstallGtkDependencies())
>+        self.addStep(CompileWebKit(skipUpload=True))
>+
>+
> class WPEFactory(Factory):
>-    pass
>+    def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
>+        Factory.__init__(self, platform, configuration, architectures, True, triggers, additionalArguments)
>+        self.addStep(KillOldProcesses())
>+        self.addStep(InstallWpeDependencies())
>+        self.addStep(CompileWebKit(skipUpload=True))
>Index: Tools/BuildSlaveSupport/ews-build/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps.py	(revision 247095)
>+++ Tools/BuildSlaveSupport/ews-build/steps.py	(working copy)
>@@ -671,7 +671,16 @@ class CompileWebKit(shell.Compile):
>     def evaluateCommand(self, cmd):
>         if cmd.didFail():
>             self.setProperty('patchFailedToBuild', True)
>-            self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileWebKitToT(), AnalyzeCompileWebKitResults()])
>+            steps_to_add = [UnApplyPatchIfRequired()]
>+            platform = self.getProperty('platform')
>+            if platform == 'wpe':
>+                steps_to_add.append(InstallWpeDependencies())
>+            elif platform == 'gtk':
>+                steps_to_add.append(InstallGtkDependencies())
>+            steps_to_add.append(CompileWebKitToT())
>+            steps_to_add.append(AnalyzeCompileWebKitResults())
>+            # Using a single addStepsAfterCurrentStep because of https://github.com/buildbot/buildbot/issues/4874
>+            self.build.addStepsAfterCurrentStep(steps_to_add)
>         else:
>             triggers = self.getProperty('triggers', None)
>             if triggers or not self.skipUpload:
>Index: Tools/BuildSlaveSupport/ews-build/steps_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(revision 247095)
>+++ Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(working copy)
>@@ -572,6 +572,36 @@ class TestCompileWebKit(BuildStepMixinAd
>         self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
>         return self.runStep()
> 
>+    def test_success_gtk(self):
>+        self.setupStep(CompileWebKit())
>+        self.setProperty('platform', 'gtk')
>+        self.setProperty('fullPlatform', 'gtk')
>+        self.setProperty('configuration', 'release')
>+        self.expectRemoteCommands(
>+            ExpectShell(workdir='wkdir',
>+                        logEnviron=False,
>+                        command=['perl', 'Tools/Scripts/build-webkit', '--release', '--gtk'],
>+                        )
>+            + 0,
>+        )
>+        self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
>+        return self.runStep()
>+
>+    def test_success_wpe(self):
>+        self.setupStep(CompileWebKit())
>+        self.setProperty('platform', 'wpe')
>+        self.setProperty('fullPlatform', 'wpe')
>+        self.setProperty('configuration', 'release')
>+        self.expectRemoteCommands(
>+            ExpectShell(workdir='wkdir',
>+                        logEnviron=False,
>+                        command=['perl', 'Tools/Scripts/build-webkit', '--release', '--wpe'],
>+                        )
>+            + 0,
>+        )
>+        self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
>+        return self.runStep()
>+
>     def test_failure(self):
>         self.setupStep(CompileWebKit())
>         self.setProperty('fullPlatform', 'mac-sierra')

Actions: View | Formatted Diff | Diff

Attachments on bug 199234: 372949 | 373387 | 373403