Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (93165 => 93166)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2011-08-16 22:20:17 UTC (rev 93166)
@@ -52,10 +52,10 @@
{ "name": "google-windows-1", "platform": "chromium-win" },
{ "name": "google-windows-2", "platform": "chromium-win" },
- { "name": "google-mac-1", "platform": "chromium-mac" },
- { "name": "google-mac-2", "platform": "chromium-mac" },
- { "name": "google-mac-3", "platform": "chromium-mac" },
- { "name": "google-mac-4", "platform": "chromium-mac" },
+ { "name": "google-mac-1", "platform": "chromium-cg-mac" },
+ { "name": "google-mac-2", "platform": "chromium-cg-mac" },
+ { "name": "google-mac-3", "platform": "chromium-cg-mac" },
+ { "name": "google-mac-4", "platform": "chromium-cg-mac" },
{ "name": "google-linux-1", "platform": "chromium-linux" },
{ "name": "google-linux-2", "platform": "chromium-linux" },
{ "name": "google-linux-flexbox", "platform": "chromium-linux" },
@@ -216,13 +216,13 @@
"slavenames": ["google-windows-2"]
},
{
- "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release",
- "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
+ "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-cg-mac-release",
+ "platform": "chromium-cg-mac", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-mac-1", "google-mac-3"]
},
{
- "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-mac-release-tests",
- "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
+ "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-cg-mac-release-tests",
+ "platform": "chromium-cg-mac", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-mac-2", "google-mac-4"]
},
{
Modified: trunk/Tools/ChangeLog (93165 => 93166)
--- trunk/Tools/ChangeLog 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/ChangeLog 2011-08-16 22:20:17 UTC (rev 93166)
@@ -1,3 +1,38 @@
+2011-08-16 Adam Barth <[email protected]>
+
+ Move chromium-mac to chromium-cg-mac to prepare for Skia switchover
+ https://bugs.webkit.org/show_bug.cgi?id=66334
+
+ Reviewed by Tony Chang.
+
+ This patch moves us closer to switching the Chromium port from
+ CoreGraphics to Skia. This patch teaches our tools that the current
+ Chromium Mac configuration is actually chromium-cg-mac, which makes
+ room for a future chromium-mac configuration that uses Skia.
+
+ Shortly after this patch lands, I'll do a server-side move of the
+ chromium-mac and chromium-mac-leopard directories to chromium-cg-mac
+ and chromium-cg-mac-leopard.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
+ * Scripts/webkitpy/common/config/build.py:
+ * Scripts/webkitpy/common/config/build_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ * Scripts/webkitpy/layout_tests/port/builders.py:
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/dryrun.py:
+ * Scripts/webkitpy/layout_tests/port/factory.py:
+ * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
+ * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
+ * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ * TestResultServer/static-dashboards/flakiness_dashboard.html:
+
2011-08-16 Dimitri Glazkov <[email protected]>
garden-o-matic frontend needs a friendly relative time description method.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -53,12 +53,12 @@
def test_move_baselines(self):
fs = MockFileSystem()
fs.write_binary_file('/mock-checkout/LayoutTests/platform/chromium-win/another/test-expected.txt', 'result A')
- fs.write_binary_file('/mock-checkout/LayoutTests/platform/chromium-mac/another/test-expected.txt', 'result A')
+ fs.write_binary_file('/mock-checkout/LayoutTests/platform/chromium-cg-mac/another/test-expected.txt', 'result A')
fs.write_binary_file('/mock-checkout/LayoutTests/platform/chromium/another/test-expected.txt', 'result B')
baseline_optimizer = BaselineOptimizer(MockSCM(), fs)
baseline_optimizer._move_baselines('another/test-expected.txt', {
'LayoutTests/platform/chromium-win': 'aaa',
- 'LayoutTests/platform/chromium-mac': 'aaa',
+ 'LayoutTests/platform/chromium-cg-mac': 'aaa',
'LayoutTests/platform/chromium': 'bbb',
}, {
'LayoutTests/platform/chromium': 'aaa',
@@ -75,7 +75,7 @@
def test_chromium_covers_mac_win_linux(self):
self._assertOptimization({
- 'LayoutTests/platform/chromium-mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
+ 'LayoutTests/platform/chromium-cg-mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
'LayoutTests/platform/chromium-linux': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
}, {
@@ -84,7 +84,7 @@
def test_chromium_mac_redundant_with_apple_mac(self):
self._assertOptimization({
- 'LayoutTests/platform/chromium-mac-snowleopard': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
+ 'LayoutTests/platform/chromium-cg-mac-snowleopard': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
'LayoutTests/platform/mac-snowleopard': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
}, {
'LayoutTests/platform/mac-snowleopard': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
@@ -122,7 +122,7 @@
self._assertOptimization({
'LayoutTests/platform/chromium-win': '23a30302a6910f8a48b1007fa36f3e3158341834',
'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127',
- 'LayoutTests/platform/chromium-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
+ 'LayoutTests/platform/chromium-cg-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
}, {
'LayoutTests/platform/chromium': '23a30302a6910f8a48b1007fa36f3e3158341834',
'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127',
@@ -133,7 +133,7 @@
'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364',
'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
- 'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
+ 'LayoutTests/platform/chromium-cg-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
'LayoutTests/platform/mac-leopard': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
'LayoutTests/platform/win': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
@@ -142,7 +142,7 @@
'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364',
'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
- 'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
+ 'LayoutTests/platform/chromium-cg-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
'LayoutTests/platform/mac-leopard': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
'LayoutTests/platform/win': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
Modified: trunk/Tools/Scripts/webkitpy/common/config/build.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -62,15 +62,15 @@
("Source/WebCore/image-decoders", ["chromium"]),
("LayoutTests/platform/mac", ["mac", "win"]),
("cairo", ["gtk", "wincairo"]),
- ("cf", ["chromium-mac", "mac", "qt", "win"]),
+ ("cf", ["chromium-cg-mac", "mac", "qt", "win"]),
("chromium", ["chromium"]),
- ("cocoa", ["chromium-mac", "mac"]),
+ ("cocoa", ["chromium-cg-mac", "mac"]),
("curl", ["gtk", "wincairo"]),
("gobject", ["gtk"]),
("gpu", ["chromium", "mac"]),
("gstreamer", ["gtk"]),
("gtk", ["gtk"]),
- ("mac", ["chromium-mac", "mac"]),
+ ("mac", ["chromium-cg-mac", "mac"]),
("mac-leopard", ["mac-leopard"]),
("mac-lion", ["mac", "win"]),
("mac-snowleopard", ["mac-leopard", "mac-snowleopard"]),
Modified: trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -48,7 +48,7 @@
(["LayoutTests/platform/win-wk2/foo"], ["win"]),
(["LayoutTests/platform/win/foo"], ["win"]),
(["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
- (["Source/WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]),
+ (["Source/WebCore/mac/foo"], ["chromium-cg-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/WebCore/win/foo"], ["chromium-win", "win"]),
(["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/WebCore/platform/wx/wxcode/win/foo"], []),
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -373,7 +373,7 @@
or '.png'. This should not be None, but may be an empty string.
platform: the most-specific directory name to use to build the
search list of directories, e.g., 'chromium-win', or
- 'chromium-mac-leopard' (we follow the WebKit format)
+ 'chromium-cg-mac-leopard' (we follow the WebKit format)
This routine is generic but is implemented here to live alongside
the other baseline and filename manipulation routines.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -46,11 +46,11 @@
"Webkit Linux 32": {"port_name": "chromium-linux-x86", "specifiers": set(["linux", "x86"])},
"Webkit Linux (dbg)(1)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
"Webkit Linux (dbg)(2)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
- "Webkit Mac10.5": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard"])},
- "Webkit Mac10.5 (dbg)(1)": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard", "debug"])},
- "Webkit Mac10.5 (dbg)(2)": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard", "debug"])},
- "Webkit Mac10.6": {"port_name": "chromium-mac-snowleopard", "specifiers": set(["snowleopard"])},
- "Webkit Mac10.6 (dbg)": {"port_name": "chromium-mac-snowleopard", "specifiers": set(["snowleopard", "debug"])},
+ "Webkit Mac10.5": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard"])},
+ "Webkit Mac10.5 (dbg)(1)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
+ "Webkit Mac10.5 (dbg)(2)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
+ "Webkit Mac10.6": {"port_name": "chromium-cg-mac-snowleopard", "specifiers": set(["snowleopard"])},
+ "Webkit Mac10.6 (dbg)": {"port_name": "chromium-cg-mac-snowleopard", "specifiers": set(["snowleopard", "debug"])},
"Webkit Mac10.6 - GPU": {"port_name": "chromium-gpu-mac-snowleopard", "specifiers": set(["snowleopard", "gpu"])},
"Webkit Win - GPU": {"port_name": "chromium-gpu-win-xp", "specifiers": set(["xp", "release", "gpu"])},
"Webkit Win7 - GPU": {"port_name": "chromium-gpu-win-win7", "specifiers": set(["win7", "vista", "release", "gpu"])},
@@ -78,7 +78,7 @@
r"Windows": "win",
r"GTK": "gtk",
r"Qt": "qt",
- r"Chromium Mac": "chromium-mac",
+ r"Chromium Mac": "chromium-cg-mac",
r"Chromium Linux": "chromium-linux",
r"Chromium Win": "chromium-win",
}
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -71,7 +71,7 @@
ALL_GRAPHICS_TYPES = ('cpu', 'gpu')
ALL_BASELINE_VARIANTS = [
- 'chromium-mac-snowleopard', 'chromium-mac-leopard',
+ 'chromium-cg-mac-snowleopard', 'chromium-cg-mac-leopard',
'chromium-win-win7', 'chromium-win-vista', 'chromium-win-xp',
'chromium-linux-x86_64', 'chromium-linux-x86',
'chromium-gpu-mac-snowleopard', 'chromium-gpu-win-win7', 'chromium-gpu-linux-x86_64',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -47,21 +47,21 @@
FALLBACK_PATHS = {
'leopard': [
- 'chromium-mac-leopard',
- 'chromium-mac',
+ 'chromium-cg-mac-leopard',
+ 'chromium-cg-mac',
'chromium',
'mac-leopard',
'mac-snowleopard',
'mac',
],
'snowleopard': [
- 'chromium-mac',
+ 'chromium-cg-mac',
'chromium',
'mac-snowleopard',
'mac',
],
'future': [
- 'chromium-mac',
+ 'chromium-cg-mac',
'chromium',
'mac',
],
@@ -70,7 +70,7 @@
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-mac'
+ port_name = port_name or 'chromium-cg-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)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -51,35 +51,35 @@
def test_versions(self):
port = chromium_mac.ChromiumMacPort()
- self.assertTrue(port.name() in ('chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac-future'))
+ 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-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.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-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.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-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.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.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')
- self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-mac-leopard'))
+ 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-snowleopard')
- self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-mac'))
+ port = chromium_mac.ChromiumMacPort(port_name='chromium-cg-mac-snowleopard')
+ self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-cg-mac'))
if __name__ == '__main__':
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/dryrun.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/dryrun.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/dryrun.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -33,7 +33,7 @@
This implementation acts as a wrapper around a real port (the real port
is held as a delegate object). To specify which port, use the port name
- 'dryrun-XXX' (e.g., 'dryrun-chromium-mac-leopard'). If you use just
+ 'dryrun-XXX' (e.g., 'dryrun-chromium-cg-mac-leopard'). If you use just
'dryrun', it uses the default port.
Note that because this is really acting as a wrapper around the underlying
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -85,7 +85,7 @@
port_to_use = 'chromium-linux'
elif sys.platform == 'darwin':
if options and hasattr(options, 'chromium') and options.chromium:
- port_to_use = 'chromium-mac'
+ port_to_use = 'chromium-cg-mac'
else:
port_to_use = 'mac'
@@ -116,7 +116,7 @@
elif port_to_use.startswith('chromium-gpu'):
import chromium_gpu
maker = chromium_gpu.get
- elif port_to_use.startswith('chromium-mac'):
+ elif port_to_use.startswith('chromium-cg-mac'):
import chromium_mac
maker = chromium_mac.ChromiumMacPort
elif port_to_use.startswith('chromium-linux'):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -125,7 +125,7 @@
self.assert_port("chromium-gpu-win", chromium_gpu.ChromiumGpuWinPort)
def test_chromium_mac(self):
- self.assert_port("chromium-mac", chromium_mac.ChromiumMacPort)
+ self.assert_port("chromium-cg-mac", chromium_mac.ChromiumMacPort)
self.assert_platform_port("darwin", self.chromium_options,
chromium_mac.ChromiumMacPort)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -55,7 +55,7 @@
# we should be able to test for the files existing or not, and
# be able to control the contents better.
- chromium_port = factory.get("chromium-mac")
+ chromium_port = factory.get("chromium-cg-mac")
chromium_base = chromium_port.path_from_chromium_base()
fs = filesystem_mock.MockFileSystem()
port = google_chrome.GetGoogleChromePort(port_name=port_name,
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -247,7 +247,7 @@
{'/tmp/png_result0.png': 'checksum\x8a-pngtEXtchecksum\x00checksum-checksum'})
def test_chromium_parse_options(self):
- options, args = mock_drt.parse_options(['--platform', 'chromium-mac',
+ options, args = mock_drt.parse_options(['--platform', 'chromium-cg-mac',
'--pixel-tests=/tmp/png_result0.png'])
self.assertTrue(options.chromium)
self.assertTrue(options.pixel_tests)
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -68,8 +68,8 @@
'chromium-win-win7': 'Webkit_Win7',
'chromium-win-vista': 'Webkit_Vista',
'chromium-win-xp': 'Webkit_Win',
- 'chromium-mac-leopard': 'Webkit_Mac10_5',
- 'chromium-mac-snowleopard': 'Webkit_Mac10_6',
+ 'chromium-cg-mac-leopard': 'Webkit_Mac10_5',
+ 'chromium-cg-mac-snowleopard': 'Webkit_Mac10_6',
'chromium-linux-x86': 'Webkit_Linux_32',
'chromium-linux-x86_64': 'Webkit_Linux',
'chromium-gpu-mac-snowleopard': 'Webkit_Mac10_6_-_GPU',
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -134,7 +134,9 @@
def test_archive(orig_archive_dict):
new_archive_dict = {}
for platform, dirname in orig_archive_dict.iteritems():
+ # This is a giant hack. :(
platform = platform.replace('chromium', 'test')
+ platform = platform.replace('test-cg', 'test')
new_archive_dict[platform] = dirname
return new_archive_dict
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (93165 => 93166)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-16 22:20:17 UTC (rev 93166)
@@ -52,7 +52,13 @@
tool = MockTool()
tool.executive = MockExecutive(should_log=True)
command.bind_to_tool(tool)
- expected_stdout = """Retrieving results for chromium-gpu-mac-leopard from Webkit Mac10.5 - GPU.
+ expected_stdout = """Retrieving results for chromium-cg-mac-leopard from Webkit Mac10.5.
+ userscripts/another-test.html
+ userscripts/images.svg
+Retrieving results for chromium-cg-mac-snowleopard from Webkit Mac10.6.
+ userscripts/another-test.html
+ userscripts/images.svg
+Retrieving results for chromium-gpu-mac-leopard from Webkit Mac10.5 - GPU.
Retrieving results for chromium-gpu-mac-snowleopard from Webkit Mac10.6 - GPU.
Retrieving results for chromium-gpu-win-win7 from Webkit Win7 - GPU.
Retrieving results for chromium-gpu-win-xp from Webkit Win - GPU.
@@ -62,12 +68,6 @@
Retrieving results for chromium-linux-x86_64 from Webkit Linux.
userscripts/another-test.html
userscripts/images.svg
-Retrieving results for chromium-mac-leopard from Webkit Mac10.5.
- userscripts/another-test.html
- userscripts/images.svg
-Retrieving results for chromium-mac-snowleopard from Webkit Mac10.6.
- userscripts/another-test.html
- userscripts/images.svg
Retrieving results for chromium-win-vista from Webkit Vista.
userscripts/another-test.html
userscripts/images.svg
@@ -80,14 +80,14 @@
Optimizing baselines for userscripts/another-test.html.
Optimizing baselines for userscripts/images.svg.
"""
- expected_stderr = """MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux 32', 'userscripts/another-test.html'], cwd=/mock-checkout
+ expected_stderr = """MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/another-test.html'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/images.svg'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/images.svg'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux 32', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux 32', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux', 'userscripts/images.svg'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/another-test.html'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/images.svg'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Vista', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Vista', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Win7', 'userscripts/another-test.html'], cwd=/mock-checkout
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html (93165 => 93166)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html 2011-08-16 22:15:57 UTC (rev 93165)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html 2011-08-16 22:20:17 UTC (rev 93166)
@@ -2439,8 +2439,8 @@
g_fallbacksMap['WIN-VISTA'] = ['chromium-win-vista', 'chromium-win', 'chromium', 'win', 'mac'];
g_fallbacksMap['WIN-7'] = ['chromium-win', 'chromium', 'win', 'mac'];
g_fallbacksMap['WIN-7-GPU'] = ['chromium-gpu-win'].concat(g_fallbacksMap['WIN-7']);
-g_fallbacksMap['MAC-LEOPARD'] = ['chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac-leopard', 'mac-snowleopard', 'mac'];
-g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac-snowleopard', 'mac'];
+g_fallbacksMap['MAC-LEOPARD'] = ['chromium-cg-mac-leopard', 'chromium-cg-mac-snowleopard', 'chromium-cg-mac', 'chromium', 'mac-leopard', 'mac-snowleopard', 'mac'];
+g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-cg-mac-snowleopard', 'chromium-cg-mac', 'chromium', 'mac-snowleopard', 'mac'];
g_fallbacksMap['MAC-SNOWLEOPARD-GPU'] = ['chromium-gpu-mac'].concat(g_fallbacksMap['MAC-SNOWLEOPARD']);
g_fallbacksMap['LINUX-32'] = ['chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'];
g_fallbacksMap['LINUX-64'] = ['chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'];
