From: slewis Date: Thu, 2 Nov 2006 03:59:39 +0000 (+0000) Subject: 2006-11-01 Stephanie Lewis X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=e0a31d7db1248c8c9b60428fdbb1022ab1b63391 2006-11-01 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: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17534 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index 82c1a38a845e..6885d60fbd9b 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,18 @@ +2006-11-01 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: + 2006-11-01 Brady Eidson Reviewed by Tim Hatcher diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit index ae85ccce9920..8706a06b6931 100755 --- a/WebKitTools/Scripts/build-webkit +++ b/WebKitTools/Scripts/build-webkit @@ -88,7 +88,7 @@ for my $dir (@projects) { my $result = 0; 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; } else { diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests index 2d4c7014cbf5..d12344e5b51c 100755 --- a/WebKitTools/Scripts/run-javascriptcore-tests +++ b/WebKitTools/Scripts/run-javascriptcore-tests @@ -39,6 +39,20 @@ my $configuration; setConfiguration(); $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(); chdir("JavaScriptCore"); @@ -47,7 +61,7 @@ chdir("JavaScriptCore"); my @options = XcodeOptions(); 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" ); } @@ -71,7 +85,7 @@ sub determineTestkjsName } $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;