Title: [97781] trunk/Tools
- Revision
- 97781
- Author
- [email protected]
- Date
- 2011-10-18 12:24:40 -0700 (Tue, 18 Oct 2011)
Log Message
[Chromium] buildbot runs nrwt with --chromium instead of --chromium-cg-mac
https://bugs.webkit.org/show_bug.cgi?id=70313
Reviewed by Adam Barth.
Fixed the bug by passing --platform --chromium-cg-mac in RunWebKitTests. We can't always add
this parameter because build-webkit and other scripts don't accept it.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (97780 => 97781)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-10-18 19:10:17 UTC (rev 97780)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-10-18 19:24:40 UTC (rev 97781)
@@ -88,9 +88,12 @@
haltOnFailure = False
-def appendCustomBuildFlags(step, platform, fullPlatform=""):
+def appendCustomBuildFlags(step, platform, fullPlatform="", useFullPlatformForChromiumCGMac=False):
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])
@@ -243,7 +246,7 @@
def start(self):
platform = self.getProperty('platform')
- appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
+ appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'), True)
if platform == "win":
rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
else:
Modified: trunk/Tools/ChangeLog (97780 => 97781)
--- trunk/Tools/ChangeLog 2011-10-18 19:10:17 UTC (rev 97780)
+++ trunk/Tools/ChangeLog 2011-10-18 19:24:40 UTC (rev 97781)
@@ -1,3 +1,15 @@
+2011-10-18 Ryosuke Niwa <[email protected]>
+
+ [Chromium] buildbot runs nrwt with --chromium instead of --chromium-cg-mac
+ https://bugs.webkit.org/show_bug.cgi?id=70313
+
+ Reviewed by Adam Barth.
+
+ Fixed the bug by passing --platform --chromium-cg-mac in RunWebKitTests. We can't always add
+ this parameter because build-webkit and other scripts don't accept it.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
2011-10-18 Adam Barth <[email protected]>
Subscribe myself to WebIDL changes
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
