[webkit-changes] [99068] trunk/Tools

Wed, 02 Nov 2011 09:27:58 -0700

Title: [99068] trunk/Tools
Revision
99068
Author
[email protected]
Date
2011-11-02 09:27:45 -0700 (Wed, 02 Nov 2011)

Log Message

until use_skia=1 by default on mac, default port should be chromium-cg-mac
https://bugs.webkit.org/show_bug.cgi?id=71312

Patch by Elliot Poger <[email protected]> on 2011-11-02
Reviewed by Adam Barth.

* Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
* Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (99067 => 99068)


--- trunk/Tools/ChangeLog	2011-11-02 16:22:47 UTC (rev 99067)
+++ trunk/Tools/ChangeLog	2011-11-02 16:27:45 UTC (rev 99068)
@@ -1,3 +1,14 @@
+2011-11-02  Elliot Poger  <[email protected]>
+
+        until use_skia=1 by default on mac, default port should be chromium-cg-mac
+        https://bugs.webkit.org/show_bug.cgi?id=71312
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+
 2011-11-02  Stephen Chenney  <[email protected]>
 
         printing layout test failures after r98634

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py (99067 => 99068)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py	2011-11-02 16:22:47 UTC (rev 99067)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py	2011-11-02 16:27:45 UTC (rev 99068)
@@ -44,7 +44,7 @@
         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)

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (99067 => 99068)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py	2011-11-02 16:22:47 UTC (rev 99067)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py	2011-11-02 16:27:45 UTC (rev 99068)
@@ -112,7 +112,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 (99067 => 99068)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py	2011-11-02 16:22:47 UTC (rev 99067)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py	2011-11-02 16:27:45 UTC (rev 99068)
@@ -51,26 +51,26 @@
 
     def test_versions(self):
         port = chromium_mac.ChromiumMacPort()
-        self.assertTrue(port.name() in ('chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac-lion', 'chromium-mac-future'))
+        self.assertTrue(port.name() in ('chromium-cg-mac-leopard', 'chromium-cg-mac-snowleopard', 'chromium-cg-mac-lion', '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')
 
@@ -89,9 +89,9 @@
         self.assertEquals('cpu-cg', port.graphics_type())
         port = chromium_mac.ChromiumMacPort(port_name='chromium-mac')
         self.assertEquals('cpu', port.graphics_type())
-        # For now, Mac defaults to cpu graphics type.
+        # For now, Mac defaults to cpu-cg graphics type.
         port = chromium_mac.ChromiumMacPort()
-        self.assertEquals('cpu', port.graphics_type())
+        self.assertEquals('cpu-cg', port.graphics_type())
 
 
 if __name__ == '__main__':

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to