Attachment 373334 Details for Bug 199408 – Patch

[patch] Patch

bug-199408-20190702124910.patch (text/plain), 6.41 KB, created by Aakash Jain on 2019-07-02 09:49:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2019-07-02 09:49:11 PDT

Size: 6.41 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 247054)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-07-02  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] Add build steps to Install Wpe and Gtk dependencies
>+        https://bugs.webkit.org/show_bug.cgi?id=199408
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/ews-build/steps.py:
>+        (InstallGtkDependencies): Build step to install dependencies for GTK. Set haltOnFailure=False so that in case of failure, build isn't
>+        marked as failed (which would indicated patch failed EWS), instead subsequent steps would be run and the build would be marked as RETRY.
>+        (InstallWpeDependencies): Ditto for WPE.
>+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
>+
> 2019-07-02  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] Update bot configuration for WPE and GTK
>Index: Tools/BuildSlaveSupport/ews-build/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps.py	(revision 247051)
>+++ Tools/BuildSlaveSupport/ews-build/steps.py	(working copy)
>@@ -593,6 +593,28 @@ class RunWebKitPyTests(shell.ShellComman
>         log.addStdout(message)
> 
> 
>+class InstallGtkDependencies(shell.ShellCommand):
>+    name = 'jhbuild'
>+    description = ['updating gtk dependencies']
>+    descriptionDone = ['Updated gtk dependencies']
>+    command = ['perl', 'Tools/Scripts/update-webkitgtk-libs']
>+    haltOnFailure = False
>+
>+    def __init__(self, **kwargs):
>+        super(InstallGtkDependencies, self).__init__(logEnviron=False, **kwargs)
>+
>+
>+class InstallWpeDependencies(shell.ShellCommand):
>+    name = 'jhbuild'
>+    description = ['updating wpe dependencies']
>+    descriptionDone = ['Updated wpe dependencies']
>+    command = ['perl', 'Tools/Scripts/update-webkitwpe-libs']
>+    haltOnFailure = False
>+
>+    def __init__(self, **kwargs):
>+        super(InstallWpeDependencies, self).__init__(logEnviron=False, **kwargs)
>+
>+
> def appendCustomBuildFlags(step, platform, fullPlatform):
>     # FIXME: Make a common 'supported platforms' list.
>     if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only', 'wpe'):
>Index: Tools/BuildSlaveSupport/ews-build/steps_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(revision 247051)
>+++ Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(working copy)
>@@ -37,7 +37,7 @@ from twisted.trial import unittest
> from steps import (AnalyzeAPITestsResults, AnalyzeCompileWebKitResults, ApplyPatch, ArchiveBuiltProduct, ArchiveTestResults,
>                    CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance, CheckStyle, CleanBuild, CleanWorkingDirectory,
>                    CompileJSCOnly, CompileJSCOnlyToT, CompileWebKit, CompileWebKitToT, ConfigureBuild,
>-                   DownloadBuiltProduct, ExtractBuiltProduct, ExtractTestResults, KillOldProcesses,
>+                   DownloadBuiltProduct, ExtractBuiltProduct, ExtractTestResults, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
>                    PrintConfiguration, ReRunAPITests, ReRunJavaScriptCoreTests, RunAPITests, RunAPITestsWithoutPatch,
>                    RunBindingsTests, RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests, RunWebKitPerlTests,
>                    RunWebKitPyTests, RunWebKitTests, TestWithFailureCount, Trigger, TransferToS3, UnApplyPatchIfRequired,
>@@ -472,6 +472,78 @@ class TestCleanBuild(BuildStepMixinAddit
>         return self.runStep()
> 
> 
>+class TestInstallGtkDependencies(BuildStepMixinAdditions, unittest.TestCase):
>+    def setUp(self):
>+        self.longMessage = True
>+        return self.setUpBuildStep()
>+
>+    def tearDown(self):
>+        return self.tearDownBuildStep()
>+
>+    def test_success(self):
>+        self.setupStep(InstallGtkDependencies())
>+        self.assertEqual(InstallGtkDependencies.haltOnFailure, False)
>+        self.expectRemoteCommands(
>+            ExpectShell(workdir='wkdir',
>+                        logEnviron=False,
>+                        command=['perl', 'Tools/Scripts/update-webkitgtk-libs'],
>+                        )
>+            + 0,
>+        )
>+        self.expectOutcome(result=SUCCESS, state_string='Updated gtk dependencies')
>+        return self.runStep()
>+
>+    def test_failure(self):
>+        self.setupStep(InstallGtkDependencies())
>+        self.assertEqual(InstallGtkDependencies.haltOnFailure, False)
>+        self.expectRemoteCommands(
>+            ExpectShell(workdir='wkdir',
>+                        logEnviron=False,
>+                        command=['perl', 'Tools/Scripts/update-webkitgtk-libs'],
>+                        )
>+            + ExpectShell.log('stdio', stdout='Unexpected error.')
>+            + 2,
>+        )
>+        self.expectOutcome(result=FAILURE, state_string='Updated gtk dependencies (failure)')
>+        return self.runStep()
>+
>+
>+class TestInstallWpeDependencies(BuildStepMixinAdditions, unittest.TestCase):
>+    def setUp(self):
>+        self.longMessage = True
>+        return self.setUpBuildStep()
>+
>+    def tearDown(self):
>+        return self.tearDownBuildStep()
>+
>+    def test_success(self):
>+        self.setupStep(InstallWpeDependencies())
>+        self.assertEqual(InstallWpeDependencies.haltOnFailure, False)
>+        self.expectRemoteCommands(
>+            ExpectShell(workdir='wkdir',
>+                        logEnviron=False,
>+                        command=['perl', 'Tools/Scripts/update-webkitwpe-libs'],
>+                        )
>+            + 0,
>+        )
>+        self.expectOutcome(result=SUCCESS, state_string='Updated wpe dependencies')
>+        return self.runStep()
>+
>+    def test_failure(self):
>+        self.setupStep(InstallWpeDependencies())
>+        self.assertEqual(InstallWpeDependencies.haltOnFailure, False)
>+        self.expectRemoteCommands(
>+            ExpectShell(workdir='wkdir',
>+                        logEnviron=False,
>+                        command=['perl', 'Tools/Scripts/update-webkitwpe-libs'],
>+                        )
>+            + ExpectShell.log('stdio', stdout='Unexpected error.')
>+            + 2,
>+        )
>+        self.expectOutcome(result=FAILURE, state_string='Updated wpe dependencies (failure)')
>+        return self.runStep()
>+
>+
> class TestCompileWebKit(BuildStepMixinAdditions, unittest.TestCase):
>     def setUp(self):
>         self.longMessage = True

Actions: View | Formatted Diff | Diff

Attachments on bug 199408: 373334