Changeset 260702 in webkit

Timestamp:

Apr 25, 2020 7:46:55 AM (4 years ago)

Author:

Diego Pino Garcia

Message:

[Flatpak SDK][EWS] Install dependencies step needs configuration as argument
​https://bugs.webkit.org/show_bug.cgi?id=210913

Follow-up on r260560. The same change is needed for EWS bots.

Reviewed by Philippe Normand.

• BuildSlaveSupport/ews-build/steps.py:

(InstallGtkDependencies): Pass 'configuration' value (Release, Debug).
(InstallWpeDependencies): Pass 'configuration' value (Release, Debug).

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (2 diffs)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -1198 +1198 @@
     description = ['updating gtk dependencies']
     descriptionDone = ['Updated gtk dependencies']
-    command = ['perl', 'Tools/Scripts/update-webkitgtk-libs']
+    command = ['perl', 'Tools/Scripts/update-webkitgtk-libs', WithProperties('--%(configuration)s')]
     haltOnFailure = True
 
@@ -1209 +1209 @@
     description = ['updating wpe dependencies']
     descriptionDone = ['Updated wpe dependencies']
-    command = ['perl', 'Tools/Scripts/update-webkitwpe-libs']
+    command = ['perl', 'Tools/Scripts/update-webkitwpe-libs', WithProperties('--%(configuration)s')]
     haltOnFailure = True
 

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -875 +875 @@
     def test_success(self):
         self.setupStep(InstallGtkDependencies())
+        self.setProperty('configuration', 'release')
         self.assertEqual(InstallGtkDependencies.haltOnFailure, True)
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['perl', 'Tools/Scripts/update-webkitgtk-libs'],
+                        command=['perl', 'Tools/Scripts/update-webkitgtk-libs', '--release'],
                         )
             + 0,
@@ -888 +889 @@
     def test_failure(self):
         self.setupStep(InstallGtkDependencies())
+        self.setProperty('configuration', 'release')
         self.assertEqual(InstallGtkDependencies.haltOnFailure, True)
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['perl', 'Tools/Scripts/update-webkitgtk-libs'],
+                        command=['perl', 'Tools/Scripts/update-webkitgtk-libs', '--release'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected error.')
@@ -911 +913 @@
     def test_success(self):
         self.setupStep(InstallWpeDependencies())
+        self.setProperty('configuration', 'release')
         self.assertEqual(InstallWpeDependencies.haltOnFailure, True)
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['perl', 'Tools/Scripts/update-webkitwpe-libs'],
+                        command=['perl', 'Tools/Scripts/update-webkitwpe-libs', '--release'],
                         )
             + 0,
@@ -924 +927 @@
     def test_failure(self):
         self.setupStep(InstallWpeDependencies())
+        self.setProperty('configuration', 'release')
         self.assertEqual(InstallWpeDependencies.haltOnFailure, True)
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['perl', 'Tools/Scripts/update-webkitwpe-libs'],
+                        command=['perl', 'Tools/Scripts/update-webkitwpe-libs', '--release'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected error.')

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-25  Diego Pino Garcia  <dpino@igalia.com>
+
+        [Flatpak SDK][EWS] Install dependencies step needs configuration as argument
+        https://bugs.webkit.org/show_bug.cgi?id=210913
+
+        Follow-up on r260560. The same change is needed for EWS bots.
+
+        Reviewed by Philippe Normand.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (InstallGtkDependencies): Pass 'configuration' value (Release, Debug).
+        (InstallWpeDependencies): Pass 'configuration' value (Release, Debug).
+
 2020-04-24  Alex Christensen  <achristensen@webkit.org>