[GTK] Enable WebKit2 building on GTK EWSs
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Apr 2013 13:50:58 +0000 (13:50 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Apr 2013 13:50:58 +0000 (13:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114500

Patch by Manuel Rego Casasnovas <rego@igalia.com> on 2013-04-12
Reviewed by Philippe Normand.

Add configuration in order to be able to setup GTK EWSs building
WebKit2. A new queue gtk-wk2-ews is added.

* QueueStatusServer/config/queues.py:
* Scripts/webkitpy/common/config/ports.py:
(DeprecatedPort.port):
(GtkWK2Port):
(GtkWK2Port.build_webkit_command):
(GtkWK2Port.run_webkit_tests_command):
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_gtk_port):
(DeprecatedPortTest):
(DeprecatedPortTest.test_gtk_wk2_port):
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
(GtkWK2EWS):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/QueueStatusServer/config/queues.py
Tools/Scripts/webkitpy/common/config/ports.py
Tools/Scripts/webkitpy/common/config/ports_unittest.py
Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py

index 5a40816..e25b36a 100644 (file)
@@ -1,3 +1,26 @@
+2013-04-12  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [GTK] Enable WebKit2 building on GTK EWSs
+        https://bugs.webkit.org/show_bug.cgi?id=114500
+
+        Reviewed by Philippe Normand.
+
+        Add configuration in order to be able to setup GTK EWSs building
+        WebKit2. A new queue gtk-wk2-ews is added.
+
+        * QueueStatusServer/config/queues.py:
+        * Scripts/webkitpy/common/config/ports.py:
+        (DeprecatedPort.port):
+        (GtkWK2Port):
+        (GtkWK2Port.build_webkit_command):
+        (GtkWK2Port.run_webkit_tests_command):
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+        (DeprecatedPortTest.test_gtk_port):
+        (DeprecatedPortTest):
+        (DeprecatedPortTest.test_gtk_wk2_port):
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        (GtkWK2EWS):
+
 2013-04-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         Remove Chromium scripts
index 7368af1..542afbf 100644 (file)
@@ -33,6 +33,7 @@ all_queue_names = [
     "qt-ews",
     "qt-wk2-ews",
     "gtk-ews",
+    "gtk-wk2-ews",
     "mac-ews",
     "mac-wk2-ews",
     "win-ews",
index b285d6b..46aace8 100644 (file)
@@ -62,6 +62,7 @@ class DeprecatedPort(object):
     def port(port_name):
         ports = {
             "gtk": GtkPort,
+            "gtk-wk2": GtkWK2Port,
             "mac": MacPort,
             "mac-wk2": MacWK2Port,
             "win": WinPort,
@@ -155,6 +156,24 @@ class GtkPort(DeprecatedPort):
         return command
 
 
+class GtkWK2Port(DeprecatedPort):
+    port_flag_name = "gtk-wk2"
+
+    def build_webkit_command(self, build_style=None):
+        command = super(GtkWK2Port, self).build_webkit_command(build_style=build_style)
+        command.append("--gtk")
+        command.append("--update-gtk")
+        command.append("--no-webkit1")
+        command.append(super(GtkWK2Port, self).makeArgs())
+        return command
+
+    def run_webkit_tests_command(self):
+        command = super(GtkWK2Port, self).run_webkit_tests_command()
+        command.append("--gtk")
+        command.append("-2")
+        return command
+
+
 class QtPort(DeprecatedPort):
     port_flag_name = "qt"
 
index ef099b0..990b1ad 100644 (file)
@@ -45,6 +45,12 @@ class DeprecatedPortTest(unittest.TestCase):
         self.assertEqual(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit2", DeprecatedPort().makeArgs()])
         self.assertEqual(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit2", DeprecatedPort().makeArgs()])
 
+    def test_gtk_wk2_port(self):
+        self.assertEqual(GtkWK2Port().flag(), "--port=gtk-wk2")
+        self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
+        self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
+
     def test_efl_port(self):
         self.assertEqual(EflPort().flag(), "--port=efl")
         self.assertEqual(EflPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--efl", "--update-efl", DeprecatedPort().makeArgs()])
index a45369c..b27bc1c 100644 (file)
@@ -144,6 +144,14 @@ class GtkEWS(AbstractEarlyWarningSystem):
     ]
 
 
+class GtkWK2EWS(AbstractEarlyWarningSystem):
+    name = "gtk-wk2-ews"
+    port_name = "gtk-wk2"
+    watchers = AbstractEarlyWarningSystem.watchers + [
+        "xan.lopez@gmail.com",
+    ]
+
+
 class EflEWS(AbstractEarlyWarningSystem):
     name = "efl-ews"
     port_name = "efl"