+2011-03-29 Mark Rowe <mrowe@apple.com>
+
+ Reviewed by Jon Honeycutt.
+
+ <http://webkit.org/b/56730> new-run-webkit-tests fails on Lion seed
+
+ Teach new-run-webkit-tests about the concept of an unreleased version of Mac OS X.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+
2011-04-01 Chang Shu <cshu@webkit.org>
Reviewed by Csaba Osztrogonác.
class ChromiumMacPort(chromium.ChromiumPort):
"""Chromium Mac implementation of the Port class."""
- SUPPORTED_OS_VERSIONS = ('leopard', 'snowleopard')
+ SUPPORTED_OS_VERSIONS = ('leopard', 'snowleopard', 'future')
FALLBACK_PATHS = {
'leopard': [
'mac-snowleopard',
'mac',
],
+ 'future': [
+ 'chromium-mac',
+ 'chromium',
+ 'mac',
+ ],
}
def __init__(self, port_name=None, os_version_string=None, **kwargs):
self._operating_system = 'mac'
def baseline_path(self):
- if self.version() == 'snowleopard':
+ if self.version() in ('snowleopard', 'future'):
# We treat Snow Leopard as the newest version of mac,
# so it gets the base dir.
return self._webkit_baseline_path('chromium-mac')
def test_versions(self):
port = chromium_mac.ChromiumMacPort()
- self.assertTrue(port.name() in ('chromium-mac-leopard', 'chromium-mac-snowleopard'))
+ self.assertTrue(port.name() in ('chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac-future'))
self.assert_name(None, '10.5.3', 'chromium-mac-leopard')
self.assert_name('chromium-mac', '10.5.3', 'chromium-mac-leopard')
self.assert_name('chromium-mac-snowleopard', '10.5.3', 'chromium-mac-snowleopard')
self.assert_name('chromium-mac-snowleopard', '10.6.3', 'chromium-mac-snowleopard')
- self.assertRaises(KeyError, self.assert_name, None, '10.7.1', 'chromium-mac-leopard')
- self.assertRaises(AssertionError, self.assert_name, None, '10.4.1', 'chromium-mac-leopard')
+ self.assert_name(None, '10.7', 'chromium-mac-future')
+ self.assert_name(None, '10.7.3', 'chromium-mac-future')
+ self.assert_name(None, '10.8', 'chromium-mac-future')
+ self.assert_name('chromium-mac', '10.7.3', 'chromium-mac-future')
+ self.assert_name('chromium-mac-future', '10.4.3', 'chromium-mac-future')
+ self.assert_name('chromium-mac-future', '10.5.3', 'chromium-mac-future')
+ self.assert_name('chromium-mac-future', '10.6.3', 'chromium-mac-future')
+ self.assert_name('chromium-mac-future', '10.7.3', 'chromium-mac-future')
+
+ self.assertRaises(AssertionError, self.assert_name, None, '10.4.1', 'should-raise-assertion-so-this-value-does-not-matter')
def test_baseline_path(self):
port = chromium_mac.ChromiumMacPort(port_name='chromium-mac-leopard')
def os_version(os_version_string=None, supported_versions=None):
- # We only support Tiger, Leopard, and Snow Leopard.
if not os_version_string:
if hasattr(platform, 'mac_ver') and platform.mac_ver()[0]:
os_version_string = platform.mac_ver()[0]
5: 'leopard',
6: 'snowleopard',
}
- version_string = version_strings[release_version]
+ assert release_version >= min(version_strings.keys())
+ version_string = version_strings.get(release_version, 'future')
if supported_versions:
assert version_string in supported_versions
return version_string
"""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', 'wk2')
+ SUPPORTED_VERSIONS = ('tiger', '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'],
'wk2': ['mac-wk2', 'mac'],
}
return 'processes'
return 'threads'
+ def baseline_path(self):
+ if self.version() != 'future':
+ return WebKitPort.baseline_path(self)
+
+ assert(self._name[-7:] == '-future')
+ return self._webkit_baseline_path(self._name[:-7])
+
def baseline_search_path(self):
return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self._version])
def test_versions(self):
port = self.make_port()
if port:
- self.assertTrue(port.name() in ('mac-tiger', 'mac-leopard', 'mac-snowleopard'))
+ self.assertTrue(port.name() in ('mac-tiger', '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-snowleopard', '10.5.3', 'mac-snowleopard')
self.assert_name('mac-snowleopard', '10.6.3', 'mac-snowleopard')
- self.assertRaises(KeyError, self.assert_name, None, '10.7.1', 'mac-leopard')
- self.assertRaises(KeyError, self.assert_name, None, '10.3.1', 'mac-leopard')
+ self.assert_name(None, '10.7', 'mac-future')
+ self.assert_name(None, '10.7.3', 'mac-future')
+ self.assert_name(None, '10.8', 'mac-future')
+ self.assert_name('mac', '10.7.3', 'mac-future')
+ self.assert_name('mac-future', '10.4.3', 'mac-future')
+ self.assert_name('mac-future', '10.5.3', 'mac-future')
+ self.assert_name('mac-future', '10.6.3', 'mac-future')
+ self.assert_name('mac-future', '10.7.3', 'mac-future')
+
+ self.assertRaises(AssertionError, self.assert_name, None, '10.3.1', 'should-raise-assertion-so-this-value-does-not-matter')
if __name__ == '__main__':