Title: [121302] trunk/Tools
- Revision
- 121302
- Author
- lforsch...@apple.com
- Date
- 2012-06-26 16:54:46 -0700 (Tue, 26 Jun 2012)
Log Message
Teach the Apple port how to build the test tools in build-webkit
https://bugs.webkit.org/show_bug.cgi?id=89540
Reviewed by Jon Lee & Simon Fraser.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests.start): pass --no-build since tools should now be in the downloaded archive
(RunUnitTests.start): ditto
* Scripts/build-webkit: add tools to the projects build list
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (121301 => 121302)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-26 23:43:03 UTC (rev 121301)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-26 23:54:46 UTC (rev 121302)
@@ -307,8 +307,11 @@
def start(self):
platform = self.getProperty('platform')
appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
+ if platform.startswith('mac'):
+ self.setCommand(self.command + ['--no-build'])
if platform == "win":
rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
+ self.setCommand(self.command + ['--no-build'])
else:
rootArgument = ['--root=WebKitBuild/bin']
if not self.buildJSCTool:
@@ -418,6 +421,8 @@
platform = self.getProperty('platform')
if platform == 'win':
self.setCommand(self.command + ['--no-build'])
+ if platform.startswith('mac'):
+ self.setCommand(self.command + ['--no-build'])
if platform.startswith('chromium'):
self.setCommand(self.command + ['--chromium'])
return shell.Test.start(self)
Modified: trunk/Tools/ChangeLog (121301 => 121302)
--- trunk/Tools/ChangeLog 2012-06-26 23:43:03 UTC (rev 121301)
+++ trunk/Tools/ChangeLog 2012-06-26 23:54:46 UTC (rev 121302)
@@ -1,3 +1,15 @@
+2012-06-26 Lucas Forschler <lforsch...@apple.com>
+
+ Teach the Apple port how to build the test tools in build-webkit
+ https://bugs.webkit.org/show_bug.cgi?id=89540
+
+ Reviewed by Jon Lee & Simon Fraser.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunWebKitTests.start): pass --no-build since tools should now be in the downloaded archive
+ (RunUnitTests.start): ditto
+ * Scripts/build-webkit: add tools to the projects build list
+
2012-06-26 Ojan Vafai <o...@chromium.org>
Only show the platform-appropriate builders for non-layout test failures in garden-o-matic
Modified: trunk/Tools/Scripts/build-webkit (121301 => 121302)
--- trunk/Tools/Scripts/build-webkit 2012-06-26 23:43:03 UTC (rev 121301)
+++ trunk/Tools/Scripts/build-webkit 2012-06-26 23:54:46 UTC (rev 121302)
@@ -246,6 +246,9 @@
# WebKit2 is only supported in SnowLeopard and later at present.
push @projects, ("Source/WebKit2", "Tools/MiniBrowser") if osXVersion()->{"minor"} >= 6 and !$noWebKit2;
+ # Build Tools needed for Apple ports
+ push @projects, ("Tools/DumpRenderTree", "Tools/WebKitTestRunner", "Source/ThirdParty/gtest", "Tools/TestWebKitAPI");
+
# Copy library and header from WebKitLibraries to a findable place in the product directory.
(system("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", $productDir) == 0) or die;
} elsif (isWinCairo()) {
@@ -375,6 +378,7 @@
push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE";
my $useGYPProject = $useGYP && ($project =~ "WebCore|_javascript_Core");
my $projectPath = $useGYPProject ? "gyp/$project" : $project;
+ $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
$result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
} elsif (isAppleWinWebKit()) {
if ($project eq "WebKit") {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
