Changeset 121302 in webkit

Timestamp:

Jun 26, 2012, 4:54:46 PM (13 years ago)

Author:

Lucas Forschler

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

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (2 diffs)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -308 +308 @@
         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']
@@ -418 +421 @@
         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'):

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-26  Lucas Forschler  <lforschler@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  <ojan@chromium.org>
 

trunk/Tools/Scripts/build-webkit

@@ -247 +247 @@
     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;
@@ -376 +379 @@
         my $useGYPProject = $useGYP && ($project =~ "WebCore|JavaScriptCore");
         my $projectPath = $useGYPProject ? "gyp/$project" : $project;
+        $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
         $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
     } elsif (isAppleWinWebKit()) {