Unreviewed, rolling out r164639.
authorrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Feb 2014 14:07:40 +0000 (14:07 +0000)
committerrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Feb 2014 14:07:40 +0000 (14:07 +0000)
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 <commit-queue@webkit.org> 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):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/common/config/ports.py
Tools/Scripts/webkitpy/common/config/ports_unittest.py

index 3079729..3793e6f 100644 (file)
@@ -1,3 +1,19 @@
+2014-02-25  Commit Queue  <commit-queue@webkit.org>
+
+        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  <rego@igalia.com>
 
         [GTK] Re-enable gtk-doc in EWS
index 2b104b3..beea3fb 100644 (file)
@@ -150,6 +150,8 @@ class GtkPort(DeprecatedPort):
         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 @@ class GtkWK2Port(DeprecatedPort):
         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
 
index daca54a..d28e96e 100644 (file)
@@ -42,14 +42,14 @@ class DeprecatedPortTest(unittest.TestCase):
     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")