Commit 912a81de authored by ossy@webkit.org's avatar ossy@webkit.org

REGRESSION(r148588): It broke the Qt WK2 EWS

https://bugs.webkit.org/show_bug.cgi?id=114737

Reviewed by Jocelyn Turcotte.

* Scripts/webkitpy/common/config/ews.json: "Qt WK2 EWS" should use qt-wk2 port.
* Scripts/webkitpy/common/config/ports.py:
(DeprecatedPort.port):
(QtPort.build_webkit_command): qt port shouldn't build WebKit2.
(QtPort.run_webkit_tests_command): qt port runs WK1 tests.
(QtWK2Port): Added.
(QtWK2Port.build_webkit_command): qt-wk2 port builds WK1 and WK2 too.
(QtWK2Port.run_webkit_tests_command): qt-wk2 port runs WK2 tests.
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_qt_port):
(DeprecatedPortTest):
(DeprecatedPortTest.test_qt_wk2_port):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148608 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e7aca694
2013-04-17 Csaba Osztrogonác <ossy@webkit.org>
REGRESSION(r148588): It broke the Qt WK2 EWS
https://bugs.webkit.org/show_bug.cgi?id=114737
Reviewed by Jocelyn Turcotte.
* Scripts/webkitpy/common/config/ews.json: "Qt WK2 EWS" should use qt-wk2 port.
* Scripts/webkitpy/common/config/ports.py:
(DeprecatedPort.port):
(QtPort.build_webkit_command): qt port shouldn't build WebKit2.
(QtPort.run_webkit_tests_command): qt port runs WK1 tests.
(QtWK2Port): Added.
(QtWK2Port.build_webkit_command): qt-wk2 port builds WK1 and WK2 too.
(QtWK2Port.run_webkit_tests_command): qt-wk2 port runs WK2 tests.
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_qt_port):
(DeprecatedPortTest):
(DeprecatedPortTest.test_qt_wk2_port):
2013-04-17 Zan Dobersek <zdobersek@igalia.com>
Unreviewed.
......@@ -30,7 +30,7 @@
]
},
"Qt WK2 EWS": {
"port": "qt",
"port": "qt-wk2",
"watchers": [
"webkit-ews@sed.inf.u-szeged.hu"
]
......
......@@ -67,6 +67,7 @@ class DeprecatedPort(object):
"mac-wk2": MacWK2Port,
"win": WinPort,
"qt": QtPort,
"qt-wk2": QtWK2Port,
"efl": EflPort,
"efl-wk2": EflWK2Port,
}
......@@ -181,9 +182,31 @@ class QtPort(DeprecatedPort):
def build_webkit_command(self, build_style=None):
command = super(QtPort, self).build_webkit_command(build_style=build_style)
command.append("--qt")
command.append("--no-webkit2")
command.append(super(QtPort, self).makeArgs())
return command
def run_webkit_tests_command(self):
command = super(QtPort, self).run_webkit_tests_command()
command.append("--qt")
return command
class QtWK2Port(DeprecatedPort):
port_flag_name = "qt-wk2"
def build_webkit_command(self, build_style=None):
command = super(QtWK2Port, self).build_webkit_command(build_style=build_style)
command.append("--qt")
command.append(super(QtWK2Port, self).makeArgs())
return command
def run_webkit_tests_command(self):
command = super(QtWK2Port, self).run_webkit_tests_command()
command.append("--qt")
command.append("-2")
return command
class EflPort(DeprecatedPort):
port_flag_name = "efl"
......
......@@ -58,6 +58,12 @@ class DeprecatedPortTest(unittest.TestCase):
def test_qt_port(self):
self.assertEqual(QtPort().flag(), "--port=qt")
self.assertEqual(QtPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests"))
self.assertEqual(QtPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", DeprecatedPort().makeArgs()])
self.assertEqual(QtPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", DeprecatedPort().makeArgs()])
self.assertEqual(QtPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--qt"])
self.assertEqual(QtPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", "--no-webkit2", DeprecatedPort().makeArgs()])
self.assertEqual(QtPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", "--no-webkit2", DeprecatedPort().makeArgs()])
def test_qt_wk2_port(self):
self.assertEqual(QtWK2Port().flag(), "--port=qt-wk2")
self.assertEqual(QtWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--qt", "-2"])
self.assertEqual(QtWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", DeprecatedPort().makeArgs()])
self.assertEqual(QtWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", DeprecatedPort().makeArgs()])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment