Diff
Modified: trunk/Tools/ChangeLog (148275 => 148276)
--- trunk/Tools/ChangeLog 2013-04-12 13:22:16 UTC (rev 148275)
+++ trunk/Tools/ChangeLog 2013-04-12 13:50:58 UTC (rev 148276)
@@ -1,3 +1,26 @@
+2013-04-12 Manuel Rego Casasnovas <r...@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 <rn...@webkit.org>
Remove Chromium scripts
Modified: trunk/Tools/QueueStatusServer/config/queues.py (148275 => 148276)
--- trunk/Tools/QueueStatusServer/config/queues.py 2013-04-12 13:22:16 UTC (rev 148275)
+++ trunk/Tools/QueueStatusServer/config/queues.py 2013-04-12 13:50:58 UTC (rev 148276)
@@ -33,6 +33,7 @@
"qt-ews",
"qt-wk2-ews",
"gtk-ews",
+ "gtk-wk2-ews",
"mac-ews",
"mac-wk2-ews",
"win-ews",
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (148275 => 148276)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2013-04-12 13:22:16 UTC (rev 148275)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2013-04-12 13:50:58 UTC (rev 148276)
@@ -62,6 +62,7 @@
def port(port_name):
ports = {
"gtk": GtkPort,
+ "gtk-wk2": GtkWK2Port,
"mac": MacPort,
"mac-wk2": MacWK2Port,
"win": WinPort,
@@ -155,6 +156,24 @@
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"
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (148275 => 148276)
--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2013-04-12 13:22:16 UTC (rev 148275)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2013-04-12 13:50:58 UTC (rev 148276)
@@ -45,6 +45,12 @@
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()])
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (148275 => 148276)
--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2013-04-12 13:22:16 UTC (rev 148275)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2013-04-12 13:50:58 UTC (rev 148276)
@@ -144,6 +144,14 @@
]
+class GtkWK2EWS(AbstractEarlyWarningSystem):
+ name = "gtk-wk2-ews"
+ port_name = "gtk-wk2"
+ watchers = AbstractEarlyWarningSystem.watchers + [
+ "xan.lo...@gmail.com",
+ ]
+
+
class EflEWS(AbstractEarlyWarningSystem):
name = "efl-ews"
port_name = "efl"
