[webkit-changes] [102465] trunk/Tools

Fri, 09 Dec 2011 12:36:50 -0800

Title: [102465] trunk/Tools
Revision
102465
Author
t...@chromium.org
Date
2011-12-09 12:36:45 -0800 (Fri, 09 Dec 2011)

Log Message

Switch the chromium mac bots to using skia test results
https://bugs.webkit.org/show_bug.cgi?id=74201

Reviewed by Ryosuke Niwa.

This is reverting http://trac.webkit.org/changeset/97781 and changing
the name in master.cfg to no longer have cg in the name.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(appendCustomBuildFlags):
(RunWebKitTests.start):

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (102464 => 102465)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2011-12-09 20:35:43 UTC (rev 102464)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2011-12-09 20:36:45 UTC (rev 102465)
@@ -54,10 +54,10 @@
 
                     { "name": "google-windows-1", "platform": "chromium-win" },
                     { "name": "google-windows-2", "platform": "chromium-win" },
-                    { "name": "google-mac-1", "platform": "chromium-cg-mac" },
-                    { "name": "google-mac-2", "platform": "chromium-cg-mac" },
-                    { "name": "google-mac-3", "platform": "chromium-cg-mac" },
-                    { "name": "google-mac-4", "platform": "chromium-cg-mac" },
+                    { "name": "google-mac-1", "platform": "chromium-mac" },
+                    { "name": "google-mac-2", "platform": "chromium-mac" },
+                    { "name": "google-mac-3", "platform": "chromium-mac" },
+                    { "name": "google-mac-4", "platform": "chromium-mac" },
                     { "name": "google-linux-1", "platform": "chromium-linux" },
                     { "name": "google-linux-2", "platform": "chromium-linux" },
                     { "name": "google-linux-android", "platform": "chromium-android" },
@@ -221,13 +221,13 @@
                       "slavenames": ["google-windows-2"]
                     },
                     {
-                      "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-cg-mac-release",
-                      "platform": "chromium-cg-mac", "configuration": "release", "architectures": ["i386"],
+                      "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release",
+                      "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-mac-1", "google-mac-3"]
                     },
                     {
-                      "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-cg-mac-release-tests",
-                      "platform": "chromium-cg-mac", "configuration": "release", "architectures": ["i386"],
+                      "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-mac-release-tests",
+                      "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-mac-2", "google-mac-4"]
                     },
                     {

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (102464 => 102465)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2011-12-09 20:35:43 UTC (rev 102464)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2011-12-09 20:36:45 UTC (rev 102465)
@@ -157,12 +157,9 @@
     haltOnFailure = False
 
 
-def appendCustomBuildFlags(step, platform, fullPlatform="", useFullPlatformForChromiumCGMac=False):
+def appendCustomBuildFlags(step, platform, fullPlatform=""):
     if fullPlatform == "chromium-android":
         step.setCommand(step.command + ['--chromium-android'])
-    elif useFullPlatformForChromiumCGMac and fullPlatform.find('-cg-mac') > 0:
-        step.setCommand(step.command + ['--platform', fullPlatform])
-        # Remove this code once Skia transition is done
     elif platform in ('chromium', 'efl', 'gtk', 'qt', 'wincairo', 'wince', 'wx'):
         step.setCommand(step.command + ['--' + platform])
 
@@ -323,7 +320,7 @@
 
     def start(self):
         platform = self.getProperty('platform')
-        appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'), True)
+        appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
         if platform == "win":
             rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
         else:

Modified: trunk/Tools/ChangeLog (102464 => 102465)


--- trunk/Tools/ChangeLog	2011-12-09 20:35:43 UTC (rev 102464)
+++ trunk/Tools/ChangeLog	2011-12-09 20:36:45 UTC (rev 102465)
@@ -1,3 +1,18 @@
+2011-12-09  Tony Chang  <t...@chromium.org>
+
+        Switch the chromium mac bots to using skia test results
+        https://bugs.webkit.org/show_bug.cgi?id=74201
+
+        Reviewed by Ryosuke Niwa.
+
+        This is reverting http://trac.webkit.org/changeset/97781 and changing
+        the name in master.cfg to no longer have cg in the name.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (appendCustomBuildFlags):
+        (RunWebKitTests.start):
+
 2011-12-09  Jocelyn Turcotte  <jocelyn.turco...@nokia.com>
 
         [Qt] Remove a wrongly placed ASSERT.

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to