Diff
Modified: trunk/Tools/ChangeLog (107270 => 107271)
--- trunk/Tools/ChangeLog 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/ChangeLog 2012-02-09 20:11:06 UTC (rev 107271)
@@ -1,3 +1,61 @@
+2012-02-09 Eric Seidel <[email protected]>
+
+ Rename ports.WebKitPort to DeprecatedPort and make it stop being all class methods
+ https://bugs.webkit.org/show_bug.cgi?id=78263
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/common/config/ports.py:
+ (DeprecatedPort):
+ (DeprecatedPort.name):
+ (DeprecatedPort.flag):
+ (DeprecatedPort.script_path):
+ (DeprecatedPort.script_shell_command):
+ (DeprecatedPort.port):
+ (DeprecatedPort.makeArgs):
+ (DeprecatedPort.update_webkit_command):
+ (DeprecatedPort.check_webkit_style_command):
+ (DeprecatedPort.prepare_changelog_command):
+ (DeprecatedPort.build_webkit_command):
+ (DeprecatedPort.run_javascriptcore_tests_command):
+ (DeprecatedPort.run_webkit_unit_tests_command):
+ (DeprecatedPort.run_webkit_tests_command):
+ (DeprecatedPort.run_python_unittests_command):
+ (DeprecatedPort.run_perl_unittests_command):
+ (DeprecatedPort.layout_tests_results_path):
+ (MacPort):
+ (WinPort):
+ (GtkPort):
+ (GtkPort.build_webkit_command):
+ (GtkPort.run_webkit_tests_command):
+ (QtPort):
+ (QtPort.build_webkit_command):
+ (EflPort):
+ (EflPort.build_webkit_command):
+ (ChromiumPort):
+ (ChromiumPort.update_webkit_command):
+ (ChromiumPort.build_webkit_command):
+ (ChromiumPort.run_webkit_tests_command):
+ (ChromiumPort.run_javascriptcore_tests_command):
+ (ChromiumXVFBPort):
+ (ChromiumXVFBPort.run_webkit_tests_command):
+ * Scripts/webkitpy/common/config/ports_unittest.py:
+ (DeprecatedPortTest):
+ (DeprecatedPortTest.test_mac_port):
+ (DeprecatedPortTest.test_gtk_port):
+ (DeprecatedPortTest.test_qt_port):
+ (DeprecatedPortTest.test_chromium_port):
+ (DeprecatedPortTest.test_chromium_xvfb_port):
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ (AbstractEarlyWarningSystem.__init__):
+ * Scripts/webkitpy/tool/commands/sheriffbot.py:
+ * Scripts/webkitpy/tool/main.py:
+ (WebKitPatch):
+ (WebKitPatch.handle_global_options):
+ * Scripts/webkitpy/tool/steps/abstractstep.py:
+ * Scripts/webkitpy/tool/steps/steps_unittest.py:
+ (StepsTest.test_runtests_args):
+
2012-02-09 Jochen Eisinger <[email protected]>
[chromium] always initialize makeArgs in buildChromiumNinja
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (107270 => 107271)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-02-09 20:11:06 UTC (rev 107271)
@@ -35,17 +35,24 @@
from webkitpy.common.system.executive import Executive
-class WebKitPort(object):
+class DeprecatedPort(object):
results_directory = "/tmp/layout-test-results"
+ # FIXME: This is only used by BotInfo.
+ def name(self):
+ return self.__class__
+
+ def flag(self):
+ if self.port_flag_name:
+ return "--port=%s" % self.port_flag_name
+ return None
+
# We might need to pass scm into this function for scm.checkout_root
- @classmethod
- def script_path(cls, script_name):
+ def script_path(self, script_name):
return os.path.join("Tools", "Scripts", script_name)
- @classmethod
- def script_shell_command(cls, script_name):
- script_path = cls.script_path(script_name)
+ def script_shell_command(self, script_name):
+ script_path = self.script_path(script_name)
return Executive.shell_command_for_script(script_path)
@staticmethod
@@ -64,206 +71,124 @@
"Darwin": MacPort,
}
# Do we really need MacPort as the ultimate default?
- return ports.get(port_name, default_port.get(platform.system(), MacPort))
+ return ports.get(port_name, default_port.get(platform.system(), MacPort))()
- @staticmethod
- def makeArgs():
+ def makeArgs(self):
+ # FIXME: This shouldn't use a static Executive().
args = '--makeargs="-j%s"' % Executive().cpu_count()
if os.environ.has_key('MAKEFLAGS'):
args = '--makeargs="%s"' % os.environ['MAKEFLAGS']
return args
- @classmethod
- def name(cls):
- raise NotImplementedError("subclasses must implement")
+ def update_webkit_command(self, non_interactive=False):
+ return self.script_shell_command("update-webkit")
- @classmethod
- def flag(cls):
- raise NotImplementedError("subclasses must implement")
+ def check_webkit_style_command(self):
+ return self.script_shell_command("check-webkit-style")
- @classmethod
- def update_webkit_command(cls, non_interactive=False):
- return cls.script_shell_command("update-webkit")
+ def prepare_changelog_command(self):
+ return self.script_shell_command("prepare-ChangeLog")
- @classmethod
- def check_webkit_style_command(cls):
- return cls.script_shell_command("check-webkit-style")
-
- @classmethod
- def prepare_changelog_command(cls):
- return cls.script_shell_command("prepare-ChangeLog")
-
- @classmethod
- def build_webkit_command(cls, build_style=None):
- command = cls.script_shell_command("build-webkit")
+ def build_webkit_command(self, build_style=None):
+ command = self.script_shell_command("build-webkit")
if build_style == "debug":
command.append("--debug")
if build_style == "release":
command.append("--release")
return command
- @classmethod
- def run_javascriptcore_tests_command(cls):
- return cls.script_shell_command("run-_javascript_core-tests")
+ def run_javascriptcore_tests_command(self):
+ return self.script_shell_command("run-_javascript_core-tests")
- @classmethod
- def run_webkit_unit_tests_command(cls):
+ def run_webkit_unit_tests_command(self):
return None
- @classmethod
- def run_webkit_tests_command(cls):
- return cls.script_shell_command("run-webkit-tests")
+ def run_webkit_tests_command(self):
+ return self.script_shell_command("run-webkit-tests")
- @classmethod
- def run_python_unittests_command(cls):
- return cls.script_shell_command("test-webkitpy")
+ def run_python_unittests_command(self):
+ return self.script_shell_command("test-webkitpy")
- @classmethod
- def run_perl_unittests_command(cls):
- return cls.script_shell_command("test-webkitperl")
+ def run_perl_unittests_command(self):
+ return self.script_shell_command("test-webkitperl")
- @classmethod
- def layout_tests_results_path(cls):
- return os.path.join(cls.results_directory, "full_results.json")
+ def layout_tests_results_path(self):
+ return os.path.join(self.results_directory, "full_results.json")
-class MacPort(WebKitPort):
+class MacPort(DeprecatedPort):
+ port_flag_name = "mac"
- @classmethod
- def name(cls):
- return "Mac"
- @classmethod
- def flag(cls):
- return "--port=mac"
+class WinPort(DeprecatedPort):
+ port_flag_name = "win"
- @classmethod
- def _system_version(cls):
- version_string = platform.mac_ver()[0] # e.g. "10.5.6"
- version_tuple = version_string.split('.')
- return map(int, version_tuple)
- @classmethod
- def is_leopard(cls):
- return tuple(cls._system_version()[:2]) == (10, 5)
+class GtkPort(DeprecatedPort):
+ port_flag_name = "gtk"
-
-class WinPort(WebKitPort):
-
- @classmethod
- def name(cls):
- return "Win"
-
- @classmethod
- def flag(cls):
- # FIXME: This is lame. We should autogenerate this from a codename or something.
- return "--port=win"
-
-
-class GtkPort(WebKitPort):
-
- @classmethod
- def name(cls):
- return "Gtk"
-
- @classmethod
- def flag(cls):
- return "--port=gtk"
-
- @classmethod
- def build_webkit_command(cls, build_style=None):
- command = WebKitPort.build_webkit_command(build_style=build_style)
+ def build_webkit_command(self, build_style=None):
+ command = super(GtkPort, self).build_webkit_command(build_style=build_style)
command.append("--gtk")
command.append("--update-gtk")
- command.append(WebKitPort.makeArgs())
+ command.append(super(GtkPort, self).makeArgs())
return command
- @classmethod
- def run_webkit_tests_command(cls):
- command = WebKitPort.run_webkit_tests_command()
+ def run_webkit_tests_command(self):
+ command = super(GtkPort, self).run_webkit_tests_command()
command.append("--gtk")
return command
-class QtPort(WebKitPort):
+class QtPort(DeprecatedPort):
+ port_flag_name = "qt"
- @classmethod
- def name(cls):
- return "Qt"
-
- @classmethod
- def flag(cls):
- return "--port=qt"
-
- @classmethod
- def build_webkit_command(cls, build_style=None):
- command = WebKitPort.build_webkit_command(build_style=build_style)
+ def build_webkit_command(self, build_style=None):
+ command = super(QtPort, self).build_webkit_command(build_style=build_style)
command.append("--qt")
- command.append(WebKitPort.makeArgs())
+ command.append(super(QtPort, self).makeArgs())
return command
-class EflPort(WebKitPort):
+class EflPort(DeprecatedPort):
+ port_flag_name = "efl"
- @classmethod
- def name(cls):
- return "Efl"
-
- @classmethod
- def flag(cls):
- return "--port=efl"
-
- @classmethod
- def build_webkit_command(cls, build_style=None):
- command = WebKitPort.build_webkit_command(build_style=build_style)
+ def build_webkit_command(self, build_style=None):
+ command = super(EflPort, self).build_webkit_command(build_style=build_style)
command.append("--efl")
- command.append(WebKitPort.makeArgs())
+ command.append(super(EflPort, self).makeArgs())
return command
-class ChromiumPort(WebKitPort):
+class ChromiumPort(DeprecatedPort):
+ port_flag_name = "chromium"
- @classmethod
- def name(cls):
- return "Chromium"
-
- @classmethod
- def flag(cls):
- return "--port=chromium"
-
- @classmethod
- def update_webkit_command(cls, non_interactive=False):
- command = WebKitPort.update_webkit_command(non_interactive=non_interactive)
+ def update_webkit_command(self, non_interactive=False):
+ command = super(ChromiumPort, self).update_webkit_command(non_interactive=non_interactive)
command.append("--chromium")
if non_interactive:
command.append("--force-update")
return command
- @classmethod
- def build_webkit_command(cls, build_style=None):
- command = WebKitPort.build_webkit_command(build_style=build_style)
+ def build_webkit_command(self, build_style=None):
+ command = super(ChromiumPort, self).build_webkit_command(build_style=build_style)
command.append("--chromium")
command.append("--update-chromium")
return command
- @classmethod
- def run_webkit_tests_command(cls):
- command = cls.script_shell_command("new-run-webkit-tests")
+ def run_webkit_tests_command(self):
+ # Note: This could be run-webkit-tests now.
+ command = self.script_shell_command("new-run-webkit-tests")
command.append("--chromium")
command.append("--skip-failing-tests")
return command
- @classmethod
- def run_javascriptcore_tests_command(cls):
+ def run_javascriptcore_tests_command(self):
return None
class ChromiumXVFBPort(ChromiumPort):
+ port_flag_name = "chromium-xvfb"
- @classmethod
- def flag(cls):
- return "--port=chromium-xvfb"
-
- @classmethod
- def run_webkit_tests_command(cls):
- return ["xvfb-run"] + ChromiumPort.run_webkit_tests_command()
+ def run_webkit_tests_command(self):
+ return ["xvfb-run"] + super(ChromiumXVFBPort, self).run_webkit_tests_command()
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (107270 => 107271)
--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2012-02-09 20:11:06 UTC (rev 107271)
@@ -32,45 +32,36 @@
from webkitpy.common.config.ports import *
-class WebKitPortTest(unittest.TestCase):
+class DeprecatedPortTest(unittest.TestCase):
def test_mac_port(self):
- self.assertEquals(MacPort.name(), "Mac")
- self.assertEquals(MacPort.flag(), "--port=mac")
- self.assertEquals(MacPort.run_webkit_tests_command(), WebKitPort.script_shell_command("run-webkit-tests"))
- self.assertEquals(MacPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit"))
- self.assertEquals(MacPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug"])
- self.assertEquals(MacPort.build_webkit_command(build_style="release"), WebKitPort.script_shell_command("build-webkit") + ["--release"])
+ self.assertEquals(MacPort().flag(), "--port=mac")
+ self.assertEquals(MacPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests"))
+ self.assertEquals(MacPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit"))
+ self.assertEquals(MacPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug"])
+ self.assertEquals(MacPort().build_webkit_command(build_style="release"), DeprecatedPort().script_shell_command("build-webkit") + ["--release"])
- class TestIsLeopard(MacPort):
- @classmethod
- def _system_version(cls):
- return [10, 5]
- self.assertTrue(TestIsLeopard.is_leopard())
-
def test_gtk_port(self):
- self.assertEquals(GtkPort.name(), "Gtk")
- self.assertEquals(GtkPort.flag(), "--port=gtk")
- self.assertEquals(GtkPort.run_webkit_tests_command(), WebKitPort.script_shell_command("run-webkit-tests") + ["--gtk"])
- self.assertEquals(GtkPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit") + ["--gtk", "--update-gtk", WebKitPort.makeArgs()])
- self.assertEquals(GtkPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", WebKitPort.makeArgs()])
+ self.assertEquals(GtkPort().flag(), "--port=gtk")
+ self.assertEquals(GtkPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk"])
+ self.assertEquals(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
+ self.assertEquals(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
def test_qt_port(self):
- self.assertEquals(QtPort.name(), "Qt")
- self.assertEquals(QtPort.flag(), "--port=qt")
- self.assertEquals(QtPort.run_webkit_tests_command(), WebKitPort.script_shell_command("run-webkit-tests"))
- self.assertEquals(QtPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit") + ["--qt", WebKitPort.makeArgs()])
- self.assertEquals(QtPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug", "--qt", WebKitPort.makeArgs()])
+ self.assertEquals(QtPort().flag(), "--port=qt")
+ self.assertEquals(QtPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests"))
+ self.assertEquals(QtPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", DeprecatedPort().makeArgs()])
+ self.assertEquals(QtPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", DeprecatedPort().makeArgs()])
def test_chromium_port(self):
- self.assertEquals(ChromiumPort.name(), "Chromium")
- self.assertEquals(ChromiumPort.flag(), "--port=chromium")
- self.assertEquals(ChromiumPort.run_webkit_tests_command(), WebKitPort.script_shell_command("new-run-webkit-tests") + ["--chromium", "--skip-failing-tests"])
- self.assertEquals(ChromiumPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit") + ["--chromium", "--update-chromium"])
- self.assertEquals(ChromiumPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug", "--chromium", "--update-chromium"])
- self.assertEquals(ChromiumPort.update_webkit_command(), WebKitPort.script_shell_command("update-webkit") + ["--chromium"])
+ self.assertEquals(ChromiumPort().flag(), "--port=chromium")
+ self.assertEquals(ChromiumPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("new-run-webkit-tests") + ["--chromium", "--skip-failing-tests"])
+ self.assertEquals(ChromiumPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--chromium", "--update-chromium"])
+ self.assertEquals(ChromiumPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--chromium", "--update-chromium"])
+ self.assertEquals(ChromiumPort().update_webkit_command(), DeprecatedPort().script_shell_command("update-webkit") + ["--chromium"])
def test_chromium_xvfb_port(self):
- self.assertEquals(ChromiumXVFBPort.run_webkit_tests_command(), ['xvfb-run'] + WebKitPort.script_shell_command('new-run-webkit-tests') + ['--chromium', '--skip-failing-tests'])
+ self.assertEquals(ChromiumXVFBPort().run_webkit_tests_command(), ['xvfb-run'] + DeprecatedPort().script_shell_command('new-run-webkit-tests') + ['--chromium', '--skip-failing-tests'])
+
if __name__ == '__main__':
unittest.main()
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (107270 => 107271)
--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2012-02-09 20:11:06 UTC (rev 107271)
@@ -27,7 +27,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from webkitpy.common.config.committers import CommitterList
-from webkitpy.common.config.ports import WebKitPort
+from webkitpy.common.config.ports import DeprecatedPort
from webkitpy.common.system.deprecated_logging import error, log
from webkitpy.common.system.executive import ScriptError
from webkitpy.tool.bot.expectedfailures import ExpectedFailures
@@ -44,7 +44,7 @@
def __init__(self):
AbstractReviewQueue.__init__(self)
- self.port = WebKitPort.port(self.port_name)
+ self.port = DeprecatedPort.port(self.port_name)
def should_proceed_with_work_item(self, patch):
return True
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py (107270 => 107271)
--- trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py 2012-02-09 20:11:06 UTC (rev 107271)
@@ -29,7 +29,6 @@
import os
from webkitpy.common.system.deprecated_logging import log
-from webkitpy.common.config.ports import WebKitPort
from webkitpy.tool.bot.sheriff import Sheriff
from webkitpy.tool.bot.sheriffircbot import SheriffIRCBot
from webkitpy.tool.commands.queues import AbstractQueue
Modified: trunk/Tools/Scripts/webkitpy/tool/main.py (107270 => 107271)
--- trunk/Tools/Scripts/webkitpy/tool/main.py 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/Scripts/webkitpy/tool/main.py 2012-02-09 20:11:06 UTC (rev 107271)
@@ -33,7 +33,7 @@
import os
import threading
-from webkitpy.common.config.ports import WebKitPort
+from webkitpy.common.config.ports import DeprecatedPort
from webkitpy.common.host import Host
from webkitpy.common.net.irc import ircproxy
from webkitpy.common.net.statusserver import StatusServer
@@ -61,6 +61,7 @@
self._irc = None
self._deprecated_port = None
+ # FIXME: Rename this deprecated_port()
def port(self):
return self._deprecated_port
@@ -98,7 +99,7 @@
if options.irc_password:
self.irc_password = options.irc_password
# If options.port is None, we'll get the default port for this platform.
- self._deprecated_port = WebKitPort.port(options.port)
+ self._deprecated_port = DeprecatedPort.port(options.port)
def should_execute_command(self, command):
if command.requires_local_commits and not self.scm().supports_local_commits():
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py (107270 => 107271)
--- trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py 2012-02-09 20:11:06 UTC (rev 107271)
@@ -29,7 +29,6 @@
import sys
from webkitpy.common.system.executive import ScriptError
-from webkitpy.common.config.ports import WebKitPort
from webkitpy.tool.steps.options import Options
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py (107270 => 107271)
--- trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2012-02-09 20:04:02 UTC (rev 107270)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2012-02-09 20:11:06 UTC (rev 107271)
@@ -29,7 +29,7 @@
import unittest
from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.common.config.ports import WebKitPort
+from webkitpy.common.config.ports import DeprecatedPort
from webkitpy.tool.mocktool import MockOptions, MockTool
from webkitpy.tool import steps
@@ -100,8 +100,7 @@
mock_options.non_interactive = False
step = steps.RunTests(MockTool(log_executive=True), mock_options)
# FIXME: We shouldn't use a real port-object here, but there is too much to mock at the moment.
- mock_port = WebKitPort()
- mock_port.name = lambda: "Mac"
+ mock_port = DeprecatedPort()
tool = MockTool(log_executive=True)
tool.port = lambda: mock_port
step = steps.RunTests(tool, mock_options)
