Diff
Modified: trunk/Tools/ChangeLog (89964 => 89965)
--- trunk/Tools/ChangeLog 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/ChangeLog 2011-06-28 22:06:09 UTC (rev 89965)
@@ -1,5 +1,30 @@
2011-06-28 Eric Seidel <[email protected]>
+ Reviewed by Dirk Pranke.
+
+ Remove webkitpy's tiger support now that WebKit no longer supports tiger
+ https://bugs.webkit.org/show_bug.cgi?id=63568
+
+ I don't think our support actually fully worked anyway. Regardless
+ tiger is dead now (thankfully)!
+
+ I also unwrapped some short lines and added a couple FIXMEs while
+ touring the code.
+
+ No new tests, only removing old ones which tested our Tiger support.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ * Scripts/webkitpy/layout_tests/port/builders.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+ * Scripts/webkitpy/tool/commands/rebaseline.py:
+ * Scripts/webkitpy/tool/commands/rebaselineserver_unittest.py:
+
+2011-06-28 Eric Seidel <[email protected]>
+
Unreviewed, just fixing a typo.
Fix misspellings of "thead" to "thread".
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -562,8 +562,7 @@
return AggregateTestOutputSet([self._results_for_platform(platform) for platform in platforms])
def graphics_type(self):
- """Returns whether the port uses accelerated graphics ('gpu') or not
- ('cpu')."""
+ """Returns whether the port uses accelerated graphics ('gpu') or not ('cpu')."""
return self._graphics_type
def architecture(self):
@@ -902,8 +901,7 @@
raise NotImplementedError('Port._path_to_lighttpd_php')
def _path_to_wdiff(self):
- """Returns the full path to the wdiff binary, or None if it is
- not available.
+ """Returns the full path to the wdiff binary, or None if it is not available.
This is likely used only by wdiff_text()"""
raise NotImplementedError('Port._path_to_wdiff')
@@ -911,8 +909,7 @@
def _webkit_baseline_path(self, platform):
"""Return the full path to the top of the baseline tree for a
given platform."""
- return self._filesystem.join(self.layout_tests_dir(), 'platform',
- platform)
+ return self._filesystem.join(self.layout_tests_dir(), 'platform', platform)
class DriverInput(object):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -65,7 +65,6 @@
WEBKIT_PORT_TO_BUILDER_NAME = {
'gtk': 'GTK Linux 32-bit Debug',
- 'mac-tiger': None,
'mac-leopard': 'Leopard Intel Debug (Tests)',
'mac-snowleopard': 'SnowLeopard Intel Release (Tests)',
'mac-wk2': 'SnowLeopard Intel Release (WebKit2 Tests)',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -105,8 +105,7 @@
if not result:
_log.error('For complete Linux build requirements, please see:')
_log.error('')
- _log.error(' http://code.google.com/p/chromium/wiki/'
- 'LinuxBuildInstructions')
+ _log.error(' http://code.google.com/p/chromium/wiki/LinuxBuildInstructions')
return result
#
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -89,8 +89,7 @@
if not result:
_log.error('For complete Mac build requirements, please see:')
_log.error('')
- _log.error(' http://code.google.com/p/chromium/wiki/'
- 'MacBuildInstructions')
+ _log.error(' http://code.google.com/p/chromium/wiki/MacBuildInstructions')
return result
@@ -122,20 +121,17 @@
self._executive.run_command([self._path_to_wdiff()], error_handler=Executive.ignore_error)
except OSError:
if logging:
- _log.warning('wdiff not found. Install using MacPorts or some '
- 'other means')
+ _log.warning('wdiff not found. Install using MacPorts or some other means')
return True
def _lighttpd_path(self, *comps):
- return self.path_from_chromium_base('third_party', 'lighttpd',
- 'mac', *comps)
+ return self.path_from_chromium_base('third_party', 'lighttpd', 'mac', *comps)
def _path_to_apache(self):
return '/usr/sbin/httpd'
def _path_to_apache_config_file(self):
- return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf',
- 'apache2-httpd.conf')
+ return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'apache2-httpd.conf')
def _path_to_lighttpd(self):
return self._lighttpd_path('bin', 'lighttpd')
@@ -147,8 +143,7 @@
return self._lighttpd_path('bin', 'php-cgi')
def _path_to_driver(self, configuration=None):
- # FIXME: make |configuration| happy with case-sensitive file
- # systems.
+ # FIXME: make |configuration| happy with case-sensitive file systems.
if not configuration:
configuration = self.get_option('configuration')
return self._build_path(configuration, self.driver_name() + '.app',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -137,6 +137,7 @@
class TestMacPort(chromium_mac.ChromiumMacPort):
def __init__(self, options):
+ # FIXME: This should use MockExecutive and MockUser as well.
chromium_mac.ChromiumMacPort.__init__(self,
options=options,
filesystem=filesystem_mock.MockFileSystem())
@@ -147,6 +148,7 @@
class TestLinuxPort(chromium_linux.ChromiumLinuxPort):
def __init__(self, options):
+ # FIXME: This should use MockExecutive and MockUser as well.
chromium_linux.ChromiumLinuxPort.__init__(self,
options=options,
filesystem=filesystem_mock.MockFileSystem())
@@ -157,6 +159,7 @@
class TestWinPort(chromium_win.ChromiumWinPort):
def __init__(self, options):
+ # FIXME: This should use MockExecutive and MockUser as well.
chromium_win.ChromiumWinPort.__init__(self,
options=options,
filesystem=filesystem_mock.MockFileSystem())
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -46,7 +46,6 @@
os_version_string = "10.5.6"
release_version = int(os_version_string.split('.')[1])
version_strings = {
- 4: 'tiger',
5: 'leopard',
6: 'snowleopard',
}
@@ -61,10 +60,9 @@
"""WebKit Mac implementation of the Port class."""
# FIXME: 'wk2' probably shouldn't be a version, it should probably be
# a modifier, like 'chromium-gpu' is to 'chromium'.
- SUPPORTED_VERSIONS = ('tiger', 'leopard', 'snowleopard', 'future', 'wk2')
+ SUPPORTED_VERSIONS = ('leopard', 'snowleopard', 'future', 'wk2')
FALLBACK_PATHS = {
- 'tiger': ['mac-tiger', 'mac-leopard', 'mac-snowleopard', 'mac'],
'leopard': ['mac-leopard', 'mac-snowleopard', 'mac'],
'snowleopard': ['mac-snowleopard', 'mac'],
'future': ['mac'],
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -98,14 +98,8 @@
def test_versions(self):
port = self.make_port()
if port:
- self.assertTrue(port.name() in ('mac-tiger', 'mac-leopard', 'mac-snowleopard', 'mac-future'))
+ self.assertTrue(port.name() in ('mac-leopard', 'mac-snowleopard', 'mac-future'))
- self.assert_name(None, '10.4.8', 'mac-tiger')
- self.assert_name('mac', '10.4.8', 'mac-tiger')
- self.assert_name('mac-tiger', '10.4.8', 'mac-tiger')
- self.assert_name('mac-tiger', '10.5.3', 'mac-tiger')
- self.assert_name('mac-tiger', '10.6.3', 'mac-tiger')
-
self.assert_name(None, '10.5.3', 'mac-leopard')
self.assert_name('mac', '10.5.3', 'mac-leopard')
self.assert_name('mac-leopard', '10.4.8', 'mac-leopard')
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -46,7 +46,6 @@
_builder_name_to_port_name = {
r"SnowLeopard": "mac-snowleopard",
r"Leopard": "mac-leopard",
- r"Tiger": "mac-tiger",
r"Windows": "win",
r"GTK": "gtk",
r"Qt": "qt",
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaselineserver_unittest.py (89964 => 89965)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaselineserver_unittest.py 2011-06-28 21:51:36 UTC (rev 89964)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaselineserver_unittest.py 2011-06-28 22:06:09 UTC (rev 89965)
@@ -292,6 +292,7 @@
class TestMacPort(WebKitPort):
def __init__(self):
+ # FIXME: This should use MockExecutive and MockUser as well.
WebKitPort.__init__(self, filesystem=mock_filesystem)
self._name = 'mac'
