Modified: trunk/Tools/ChangeLog (93544 => 93545)
--- trunk/Tools/ChangeLog 2011-08-22 21:38:41 UTC (rev 93544)
+++ trunk/Tools/ChangeLog 2011-08-22 21:45:39 UTC (rev 93545)
@@ -1,3 +1,13 @@
+2011-08-22 Dimitri Glazkov <[email protected]>
+
+ [Chromium] Expand CPU/GPU/Skia/CG into a matrix in graphics_type.
+ https://bugs.webkit.org/show_bug.cgi?id=66705
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py: Added plumbing for CG graphics types.
+ * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py: Adjusted unit test.
+
2011-08-22 James Robinson <[email protected]>
[chromium] Update builder names for chromium gpu bots due to CG switchover
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (93544 => 93545)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-08-22 21:38:41 UTC (rev 93544)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-08-22 21:45:39 UTC (rev 93545)
@@ -68,7 +68,9 @@
('lucid', 'x86'),
('lucid', 'x86_64'))
- ALL_GRAPHICS_TYPES = ('cpu', 'gpu', 'cg')
+ ALL_GRAPHICS_TYPES = ('cpu', 'gpu')
+ CORE_GRAPHICS_VERSIONS = ('leopard', 'snowleopard')
+ CORE_GRAPHICS_TYPES = ('cpu-cg', 'gpu-cg')
ALL_BASELINE_VARIANTS = [
'chromium-cg-mac-snowleopard', 'chromium-cg-mac-leopard',
@@ -291,11 +293,10 @@
for version, architecture in self.ALL_SYSTEMS:
for build_type in self.ALL_BUILD_TYPES:
for graphics_type in self.ALL_GRAPHICS_TYPES:
- test_configurations.append(TestConfiguration(
- version=version,
- architecture=architecture,
- build_type=build_type,
- graphics_type=graphics_type))
+ test_configurations.append(TestConfiguration(version, architecture, build_type, graphics_type))
+ if version in self.CORE_GRAPHICS_VERSIONS:
+ for graphics_type in self.CORE_GRAPHICS_TYPES:
+ test_configurations.append(TestConfiguration(version, architecture, build_type, graphics_type))
return test_configurations
try_builder_names = frozenset([
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py (93544 => 93545)
--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py 2011-08-22 21:38:41 UTC (rev 93544)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py 2011-08-22 21:45:39 UTC (rev 93545)
@@ -92,11 +92,9 @@
self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Win"), set([TestConfiguration(version='xp', architecture='x86', build_type='release', graphics_type='cpu')]))
self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Vista"), set([
TestConfiguration(version='vista', architecture='x86', build_type='debug', graphics_type='cpu'),
- TestConfiguration(version='vista', architecture='x86', build_type='debug', graphics_type='cg'),
TestConfiguration(version='vista', architecture='x86', build_type='debug', graphics_type='gpu'),
TestConfiguration(version='vista', architecture='x86', build_type='release', graphics_type='gpu'),
- TestConfiguration(version='vista', architecture='x86', build_type='release', graphics_type='cpu'),
- TestConfiguration(version='vista', architecture='x86', build_type='release', graphics_type='cg')]))
+ TestConfiguration(version='vista', architecture='x86', build_type='release', graphics_type='cpu')]))
self.assertRaises(KeyError, extrapolator.extrapolate_test_configurations, "Potato")
