Changeset 17277 in webkit

Timestamp:

Oct 24, 2006 9:23:13 PM (18 years ago)

Author:

slewis

Message:

2006-10-24 Stephanie Lewis <Stephanie Lewis>

Reviewed by Maciej.

• Changed run-javascriptcore tests to build testkjs before running.

• Scripts/run-javascriptcore-tests:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2006-10-24  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Maciej.
+
+        - Changed run-javascriptcore tests to build testkjs before running.
+
+        * Scripts/run-javascriptcore-tests:
+
 2006-10-24  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebKitTools/Scripts/run-javascriptcore-tests

@@ -33 +33 @@
 use lib $FindBin::Bin;
 use webkitdirs;
+use POSIX;
 
+# determine configuration
+my $configuration;
 setConfiguration();
+$configuration = configuration();
+
+# Find JavaScriptCore directory
+chdirWebKit();
+chdir("JavaScriptCore");
+
+#compile TestKJS
+my @options = XcodeOptions();
+my $result;
+if (isOSX()) {
+    $result = system "xcodebuild", "-project", "JavaScriptCore.xcodeproj", "-target", "testkjs", @options, @ARGV;
+}elsif (isCygwin()) {
+    $result = buildVisualStudioProject( "JavaScriptCore" );
+}
+exit WEXITSTATUS($result) if WEXITSTATUS($result);
+
 my $productDir = productDir();
-
-chdirWebKit();
-chdir "JavaScriptCore/tests/mozilla" or die;
+chdir "tests/mozilla" or die;
 
 $productDir .= "/JavaScriptCore" if (isQt());
@@ -44 +61 @@
 
 my $testkjsName;
-my $configuration;
 sub determineTestkjsName
 {
     return if $testkjsName;
-    $configuration = configuration();
     if (isCygwin() && ($configuration eq "Debug")) {
         $testkjsName = "testkjs_debug";
@@ -57 +72 @@
 $testkjsName = determineTestkjsName();
 
-my $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", @ARGV;
 
 exit $result if $result;