Changeset 93545 in webkit

Timestamp:

Aug 22, 2011 2:45:39 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

[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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)
• Scripts/webkitpy/tool/servers/gardeningserver_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-22  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        [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  <jamesr@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -69 +69 @@
         ('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 = [
@@ -292 +294 @@
             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
 

trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py

@@ -93 +93 @@
         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")