Changeset 93530 in webkit

Timestamp:

Aug 22, 2011 12:35:50 PM (13 years ago)

Author:

jamesr@google.com

Message:

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

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/builders.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_gpu.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-22  James Robinson  <jamesr@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  <dpranke@chromium.org>
 

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

@@ -52 +52 @@
     "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"])},
@@ -58 +57 @@
     # "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.

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

@@ -45 +45 @@
             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)
@@ -51 +51 @@
     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'):
@@ -78 +78 @@
     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.
@@ -103 +103 @@
 
 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))
 

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

@@ -45 +45 @@
         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):
@@ -96 +96 @@
         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)))
@@ -117 +117 @@
 
     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'))