Diff
Modified: trunk/Tools/ChangeLog (93529 => 93530)
--- trunk/Tools/ChangeLog 2011-08-22 19:12:59 UTC (rev 93529)
+++ trunk/Tools/ChangeLog 2011-08-22 19:35:50 UTC (rev 93530)
@@ -1,3 +1,15 @@
+2011-08-22 James Robinson <jam...@chromium.org>
+
+ [chromium] Update builder names for chromium gpu bots due to CG switchover
+ https://bugs.webkit.org/show_bug.cgi?id=66693
+
+ Reviewed by Dirk Pranke.
+
+ Update the port and builder names for the chromium mac gpu bots to
+ account for the CG transition.
+
+ * Scripts/webkitpy/layout_tests/port/builders.py:
+
2011-08-22 Dirk Pranke <dpra...@chromium.org>
fix the GPU bot names on the layout test dashboard
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py (93529 => 93530)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-08-22 19:12:59 UTC (rev 93529)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-08-22 19:35:50 UTC (rev 93530)
@@ -51,14 +51,13 @@
"Webkit Mac10.5 (CG)(dbg)(2)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
"Webkit Mac10.6 (CG)": {"port_name": "chromium-cg-mac-snowleopard", "specifiers": set(["snowleopard"])},
"Webkit Mac10.6 (CG)(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"])},
# FIXME: For some reason, these port names don't work correctly.
# "Webkit Linux - GPU": {"port_name": "chromium-gpu-linux-x86_64", "specifiers": set(["linux", "gpu"])},
# "Webkit Linux 32 - GPU": {"port_name": "chromium-gpu-linux-x86", "specifiers": set(["linux", "x86", "gpu"])},
- "Webkit Mac10.5 - GPU": {"port_name": "chromium-gpu-mac-leopard", "specifiers": set(["leopard", "gpu"])},
- "Webkit Mac10.6 - GPU": {"port_name": "chromium-gpu-mac-snowleopard", "specifiers": set(["mac", "gpu"])},
+ "Webkit Mac10.5 (CG) - GPU": {"port_name": "chromium-gpu-cg-mac-leopard", "specifiers": set(["leopard", "gpu"])},
+ "Webkit Mac10.6 (CG) - GPU": {"port_name": "chromium-gpu-cg-mac-snowleopard", "specifiers": set(["mac", "gpu"])},
# These builders are on build.webkit.org.
"GTK Linux 32-bit Debug": {"port_name": "gtk", "specifiers": set(["gtk"])},
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py (93529 => 93530)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-08-22 19:12:59 UTC (rev 93529)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-08-22 19:35:50 UTC (rev 93530)
@@ -44,13 +44,13 @@
elif platform.startswith('linux'):
port_name = 'chromium-gpu-linux'
elif platform == 'darwin':
- port_name = 'chromium-gpu-mac'
+ port_name = 'chromium-gpu-cg-mac'
else:
raise NotImplementedError('unsupported platform: %s' % platform)
if port_name.startswith('chromium-gpu-linux'):
return ChromiumGpuLinuxPort(port_name=port_name, **kwargs)
- if port_name.startswith('chromium-gpu-mac'):
+ if port_name.startswith('chromium-gpu-cg-mac'):
return ChromiumGpuMacPort(port_name=port_name, **kwargs)
if port_name.startswith('chromium-gpu-win'):
return ChromiumGpuWinPort(port_name=port_name, **kwargs)
@@ -77,7 +77,7 @@
def _tests(port, paths):
if not paths:
paths = ['compositing', 'platform/chromium/compositing', 'media', 'animations/3d']
- if not port.name().startswith('chromium-gpu-mac'):
+ if not port.name().startswith('chromium-gpu-cg-mac'):
# Canvas is not yet accelerated on the Mac, so there's no point
# in running the tests there.
paths += ['fast/canvas', 'canvas/philip']
@@ -102,12 +102,12 @@
class ChromiumGpuMacPort(chromium_mac.ChromiumMacPort):
- def __init__(self, port_name='chromium-gpu-mac', **kwargs):
+ def __init__(self, port_name='chromium-gpu-cg-mac', **kwargs):
chromium_mac.ChromiumMacPort.__init__(self, port_name=port_name, **kwargs)
_set_gpu_options(self)
def baseline_search_path(self):
- return (map(self._webkit_baseline_path, ['chromium-gpu-mac', 'chromium-gpu']) +
+ return (map(self._webkit_baseline_path, ['chromium-gpu-cg-mac', 'chromium-gpu']) +
chromium_mac.ChromiumMacPort.baseline_search_path(self))
def tests(self, paths):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py (93529 => 93530)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-08-22 19:12:59 UTC (rev 93529)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-08-22 19:35:50 UTC (rev 93530)
@@ -44,8 +44,8 @@
def integration_test_chromium_gpu_mac(self):
if sys.platform != 'darwin':
return
- self.assert_port_works('chromium-gpu-mac')
- self.assert_port_works('chromium-gpu-mac', 'chromium-gpu', 'darwin')
+ self.assert_port_works('chromium-gpu-cg-mac')
+ self.assert_port_works('chromium-gpu-cg-mac', 'chromium-gpu', 'darwin')
def integration_test_chromium_gpu_win(self):
if sys.platform not in ('cygwin', 'win32'):
@@ -95,7 +95,7 @@
path = 'fast/html/keygen.html'
self.assertTrue(port._filesystem.exists(port.abspath_for_test(path)))
self.assertFalse(path in files)
- if port_name.startswith('chromium-gpu-mac'):
+ if port_name.startswith('chromium-gpu-cg-mac'):
path = 'fast/canvas/set-colors.html'
self.assertTrue(port._filesystem.exists(port.abspath_for_test(path)))
self.assertFalse(path in files)
@@ -116,14 +116,14 @@
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-gpu-win'))
def test_chromium_gpu__leopard(self):
- port = factory.get('chromium-gpu-mac-leopard')
- self.assertEquals(port.name(), 'chromium-gpu-mac-leopard')
- self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-gpu-mac'))
+ port = factory.get('chromium-gpu-cg-mac-leopard')
+ self.assertEquals(port.name(), 'chromium-gpu-cg-mac-leopard')
+ self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-gpu-cg-mac'))
def test_chromium_gpu__snowleopard(self):
- port = factory.get('chromium-gpu-mac-snowleopard')
- self.assertEquals(port.name(), 'chromium-gpu-mac-snowleopard')
- self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-gpu-mac'))
+ port = factory.get('chromium-gpu-cg-mac-snowleopard')
+ self.assertEquals(port.name(), 'chromium-gpu-cg-mac-snowleopard')
+ self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-gpu-cg-mac'))
if __name__ == '__main__':
