[webkit-changes] [164644] trunk/Tools

Tue, 25 Feb 2014 06:02:32 -0800

Title: [164644] trunk/Tools
Revision
164644
Author
[email protected]
Date
2014-02-25 06:07:40 -0800 (Tue, 25 Feb 2014)

Log Message

Unreviewed, rolling out r164639.
http://trac.webkit.org/changeset/164639
https://bugs.webkit.org/show_bug.cgi?id=129302

gtk-doc still have problems in EWS (Requested by rego on
#webkit).

Patch by Commit Queue <[email protected]> on 2014-02-25

* Scripts/webkitpy/common/config/ports.py:
(GtkPort.build_webkit_command):
(GtkWK2Port.build_webkit_command):
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_gtk_port):
(DeprecatedPortTest.test_gtk_wk2_port):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (164643 => 164644)


--- trunk/Tools/ChangeLog	2014-02-25 13:31:45 UTC (rev 164643)
+++ trunk/Tools/ChangeLog	2014-02-25 14:07:40 UTC (rev 164644)
@@ -1,3 +1,19 @@
+2014-02-25  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r164639.
+        http://trac.webkit.org/changeset/164639
+        https://bugs.webkit.org/show_bug.cgi?id=129302
+
+        gtk-doc still have problems in EWS (Requested by rego on
+        #webkit).
+
+        * Scripts/webkitpy/common/config/ports.py:
+        (GtkPort.build_webkit_command):
+        (GtkWK2Port.build_webkit_command):
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+        (DeprecatedPortTest.test_gtk_port):
+        (DeprecatedPortTest.test_gtk_wk2_port):
+
 2014-02-25  Manuel Rego Casasnovas  <[email protected]>
 
         [GTK] Re-enable gtk-doc in EWS

Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (164643 => 164644)


--- trunk/Tools/Scripts/webkitpy/common/config/ports.py	2014-02-25 13:31:45 UTC (rev 164643)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py	2014-02-25 14:07:40 UTC (rev 164644)
@@ -150,6 +150,8 @@
         command.append("--gtk")
         command.append("--update-gtk")
         command.append("--no-webkit2")
+        # FIXME: Disable gtk-doc temporarily due to http://webkit.org/b/128369.
+        command.append("--disable-gtk-doc")
         command.append(super(GtkPort, self).makeArgs())
         return command
 
@@ -167,6 +169,8 @@
         command.append("--gtk")
         command.append("--update-gtk")
         command.append("--no-webkit1")
+        # FIXME: Disable gtk-doc temporarily due to http://webkit.org/b/128369.
+        command.append("--disable-gtk-doc")
         command.append(super(GtkWK2Port, self).makeArgs())
         return command

Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (164643 => 164644)


--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2014-02-25 13:31:45 UTC (rev 164643)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2014-02-25 14:07:40 UTC (rev 164644)
@@ -42,14 +42,14 @@
     def test_gtk_port(self):
         self.assertEqual(GtkPort().flag(), "--port=gtk")
         self.assertEqual(GtkPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk"])
-        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()])
+        self.assertEqual(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit2", "--disable-gtk-doc", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit2", "--disable-gtk-doc", 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()])
+        self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", "--disable-gtk-doc", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", "--disable-gtk-doc", DeprecatedPort().makeArgs()])
 
     def test_efl_port(self):
         self.assertEqual(EflPort().flag(), "--port=efl")

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to