Changeset 17534 in webkit

Timestamp:

Nov 1, 2006 7:59:39 PM (17 years ago)

Author:

slewis

Message:

2006-11-01 Stephanie Lewis <Stephanie Lewis>

Reviewed by Kevin.

Fixed bug where additional arguments got fed to xcode and jsdriver.pl
Since testkjs is being built before the tests are run, we don't need
to build it with webkit.

Fixes bugs
​http://bugs.webkit.org/show_bug.cgi?id=11462
​http://bugs.webkit.org/show_bug.cgi?id=6168

• Scripts/build-webkit:
• Scripts/run-javascriptcore-tests:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2006-11-01  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Kevin.
+        
+        Fixed bug where additional arguments got fed to xcode and jsdriver.pl
+        Since testkjs is being built before the tests are run, we don't need 
+        to build it with webkit.
+        
+        Fixes bugs
+        http://bugs.webkit.org/show_bug.cgi?id=11462
+        http://bugs.webkit.org/show_bug.cgi?id=6168
+
+        * Scripts/build-webkit:
+        * Scripts/run-javascriptcore-tests:
+
 2006-11-01  Brady Eidson  <beidson@apple.com>
 

trunk/WebKitTools/Scripts/build-webkit

@@ -89 +89 @@
     if (isOSX()) {
         if ($dir eq "JavaScriptCore") {
-            $result = system "xcodebuild", "-project", "$dir.xcodeproj", "-target", "All", @options, @ARGV;
+            $result = system "xcodebuild", "-project", "$dir.xcodeproj", @options, @ARGV;
         } elsif ($dir eq "WebCore") {
             $result = system "xcodebuild", "-project", "$dir.xcodeproj", @options, @additionalWebCoreOptions, @ARGV;

trunk/WebKitTools/Scripts/run-javascriptcore-tests

@@ -40 +40 @@
 $configuration = configuration();
 
+my @jsArgs;
+my @xcodeArgs;
+
+# pre-evaluate arguments.  jsDriver args have - preceding, xcode args do not.
+foreach my $arg(@ARGV) {
+    print $arg."\n";
+    if( $arg =~ /^-/ ){
+        push( @jsArgs, $arg );
+    } else {
+        push( @xcodeArgs, $arg );
+        
+    }
+}
+        
 # Find JavaScriptCore directory
 chdirWebKit();
@@ -48 +62 @@
 my $result;
 if (isOSX()) {
-    $result = system "xcodebuild", "-project", "JavaScriptCore.xcodeproj", "-target", "testkjs", @options, @ARGV;
+    $result = system "xcodebuild", "-project", "JavaScriptCore.xcodeproj", "-target", "testkjs", @options, @xcodeArgs;
 }elsif (isCygwin()) {
     $result = buildVisualStudioProject( "JavaScriptCore" );
@@ -72 +86 @@
 $testkjsName = determineTestkjsName();
 
-$result = system "perl", "jsDriver.pl", "-e", "kjs", "-s", "$productDir/$testkjsName", "-f", "actual.html", @ARGV;
+$result = system "perl", "jsDriver.pl", "-e", "kjs", "-s", "$productDir/$testkjsName", "-f", "actual.html", @jsArgs;
 
 exit $result if $result;