Commit b99a6dfc authored by mihaip@chromium.org's avatar mihaip@chromium.org

update layout_tests to account for new default of use_skia=1

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

Rolls Source/WebKit/chromium/DEPS to pick up new default use_skia=1
from http://src.chromium.org/viewvc/chrome?view=rev&revision=102532
(Chromium-on-Mac now uses the Skia graphics library instead of
Core Graphics).

Also updates layout_test code to work with that change.

Patch by Elliot Poger <epoger@google.com> on 2011-09-23
Reviewed by Mihai Parparita.

Source/WebKit/chromium:

* DEPS:

Tools:

* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
* Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95850 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 982c9ea2
2011-09-23 Elliot Poger <epoger@google.com>
update layout_tests to account for new default of use_skia=1
https://bugs.webkit.org/show_bug.cgi?id=68698
Rolls Source/WebKit/chromium/DEPS to pick up new default use_skia=1
from http://src.chromium.org/viewvc/chrome?view=rev&revision=102532
(Chromium-on-Mac now uses the Skia graphics library instead of
Core Graphics).
Also updates layout_test code to work with that change.
Reviewed by Mihai Parparita.
* DEPS:
2011-09-22 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed. Rolled DEPS.
......
......@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
'chromium_rev': '102247'
'chromium_rev': '102532'
}
deps = {
......@@ -110,7 +110,9 @@ deps = {
'third_party/libwebp':
Var('chromium_svn')+'/third_party/libwebp@'+Var('chromium_rev'),
'tools/grit':
Var('chromium_svn')+'/tools/grit@'+Var('chromium_rev'),
From('chromium_deps', 'src/tools/grit'),
'tools/gritsettings':
Var('chromium_svn')+'/tools/gritsettings@'+Var('chromium_rev'),
'tools/generate_stubs':
Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
'ui':
......
2011-09-23 Elliot Poger <epoger@google.com>
update layout_tests to account for new default of use_skia=1
https://bugs.webkit.org/show_bug.cgi?id=68698
Rolls Source/WebKit/chromium/DEPS to pick up new default use_skia=1
from http://src.chromium.org/viewvc/chrome?view=rev&revision=102532
(Chromium-on-Mac now uses the Skia graphics library instead of
Core Graphics).
Also updates layout_test code to work with that change.
Reviewed by Mihai Parparita.
* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
* Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
2011-09-23 Mark Rowe <mrowe@apple.com>
Fix the build.
......@@ -92,7 +92,7 @@ class ChromiumMacPort(chromium.ChromiumPort):
def __init__(self, port_name=None, os_version_string=None, **kwargs):
# We're a little generic here because this code is reused by the
# 'google-chrome' port as well as the 'mock-' and 'dryrun-' ports.
port_name = port_name or 'chromium-cg-mac' # FIXME: Change the default to chromium-mac once we're ready.
port_name = port_name or 'chromium-mac'
chromium.ChromiumPort.__init__(self, port_name=port_name, **kwargs)
if port_name.endswith('-mac'):
self._version = mac.os_version(os_version_string, self.SUPPORTED_OS_VERSIONS)
......
......@@ -51,44 +51,44 @@ class ChromiumMacPortTest(port_testcase.PortTestCase):
def test_versions(self):
port = chromium_mac.ChromiumMacPort()
self.assertTrue(port.name() in ('chromium-cg-mac-leopard', 'chromium-cg-mac-snowleopard', 'chromium-cg-mac-future'))
self.assert_name(None, '10.5.3', 'chromium-cg-mac-leopard')
self.assert_name('chromium-cg-mac', '10.5.3', 'chromium-cg-mac-leopard')
self.assert_name('chromium-cg-mac-leopard', '10.5.3', 'chromium-cg-mac-leopard')
self.assert_name('chromium-cg-mac-leopard', '10.6.3', 'chromium-cg-mac-leopard')
self.assert_name(None, '10.6.3', 'chromium-cg-mac-snowleopard')
self.assert_name('chromium-cg-mac', '10.6.3', 'chromium-cg-mac-snowleopard')
self.assert_name('chromium-cg-mac-snowleopard', '10.5.3', 'chromium-cg-mac-snowleopard')
self.assert_name('chromium-cg-mac-snowleopard', '10.6.3', 'chromium-cg-mac-snowleopard')
self.assert_name(None, '10.7', 'chromium-cg-mac-lion')
self.assert_name(None, '10.7.3', 'chromium-cg-mac-lion')
self.assert_name(None, '10.8', 'chromium-cg-mac-future')
self.assert_name('chromium-cg-mac', '10.7.3', 'chromium-cg-mac-lion')
self.assert_name('chromium-cg-mac-future', '10.4.3', 'chromium-cg-mac-future')
self.assert_name('chromium-cg-mac-future', '10.5.3', 'chromium-cg-mac-future')
self.assert_name('chromium-cg-mac-future', '10.6.3', 'chromium-cg-mac-future')
self.assert_name('chromium-cg-mac-future', '10.7.3', 'chromium-cg-mac-future')
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-leopard', '10.5.3', 'chromium-mac-leopard')
self.assert_name('chromium-mac-leopard', '10.6.3', 'chromium-mac-leopard')
self.assert_name(None, '10.6.3', 'chromium-mac-snowleopard')
self.assert_name('chromium-mac', '10.6.3', 'chromium-mac-snowleopard')
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.assert_name(None, '10.7', 'chromium-mac-lion')
self.assert_name(None, '10.7.3', 'chromium-mac-lion')
self.assert_name(None, '10.8', 'chromium-mac-future')
self.assert_name('chromium-mac', '10.7.3', 'chromium-mac-lion')
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-cg-mac-leopard')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-cg-mac-leopard'))
port = chromium_mac.ChromiumMacPort(port_name='chromium-mac-leopard')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-mac-leopard'))
port = chromium_mac.ChromiumMacPort(port_name='chromium-cg-mac-snowleopard')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-cg-mac'))
port = chromium_mac.ChromiumMacPort(port_name='chromium-mac-snowleopard')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-mac'))
def test_graphics_type(self):
port = chromium_mac.ChromiumMacPort(port_name='chromium-cg-mac')
self.assertEquals('cpu-cg', port.graphics_type())
port = chromium_mac.ChromiumMacPort(port_name='chromium-mac')
self.assertEquals('cpu', port.graphics_type())
# For now, Mac defaults to cpu-cg graphics type.
# For now, Mac defaults to cpu graphics type.
port = chromium_mac.ChromiumMacPort()
self.assertEquals('cpu-cg', port.graphics_type())
self.assertEquals('cpu', port.graphics_type())
if __name__ == '__main__':
......
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