Changeset 157607 in webkit

Timestamp:

Oct 17, 2013, 3:28:32 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Run JavaScriptCore tests again on Windows.
​https://bugs.webkit.org/show_bug.cgi?id=122787

Patch by Alex Christensen <​achristensen@webkit.org> on 2013-10-17
Reviewed by Tim Horton.

Source/JavaScriptCore:

• JavaScriptCore.vcxproj/JavaScriptCore.sln: Added.
• jit/JITStubsMSVC64.asm: Removed reference to cti_vm_throw unused since r157581.

Tools:

• Scripts/build-jsc:

(buildMyProject): Use JavaScriptCore.sln to build JavaScriptCore and WTF.

• Scripts/run-javascriptcore-tests: Don't run stress tests on WinCairo.
• Scripts/webkitdirs.pm:

(determineConfigurationForVisualStudio):
(determineConfigurationProductDir):
Build directory should end with bin64 and configuration should end with |x64 on Win64.
(isAppleWinWebKit):
(copyInspectorFrontendFiles):
(setPathForRunningWebKitApp):
Separated WinCairo directories and options from AppleWin.

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln (added)
• Source/JavaScriptCore/jit/JITStubsMSVC64.asm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-jsc (modified) (1 diff)
• Tools/Scripts/run-javascriptcore-tests (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-10-17  Alex Christensen  <achristensen@webkit.org>
+
+        Run JavaScriptCore tests again on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=122787
+
+        Reviewed by Tim Horton.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.sln: Added.
+        * jit/JITStubsMSVC64.asm: Removed reference to cti_vm_throw unused since r157581.
+
 2013-10-17  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/jit/JITStubsMSVC64.asm

@@ -24 +24 @@
 ;*/
 
-EXTERN cti_vm_throw : near
 EXTERN cti_vm_handle_exception : near
 EXTERN getHostCallReturnValueWithExecState : near

trunk/Tools/ChangeLog

@@ +1 @@
+2013-10-17  Alex Christensen  <achristensen@webkit.org>
+
+        Run JavaScriptCore tests again on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=122787
+
+        Reviewed by Tim Horton.
+
+        * Scripts/build-jsc:
+        (buildMyProject): Use JavaScriptCore.sln to build JavaScriptCore and WTF.
+        * Scripts/run-javascriptcore-tests: Don't run stress tests on WinCairo.
+        * Scripts/webkitdirs.pm:
+        (determineConfigurationForVisualStudio):
+        (determineConfigurationProductDir):
+        Build directory should end with bin64 and configuration should end with |x64 on Win64.
+        (isAppleWinWebKit):
+        (copyInspectorFrontendFiles):
+        (setPathForRunningWebKitApp):
+        Separated WinCairo directories and options from AppleWin.
+
 2013-10-17  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Tools/Scripts/build-jsc

@@ -85 +85 @@
     if (isAppleMacWebKit()) {
         $result = system "sh", "-c", ('xcodebuild -project ' . $projectName . '.xcodeproj "$@" | grep -v setenv && exit ${PIPESTATUS[0]}'), "xcodebuild",  @options, @ARGV, @coverageSupportOptions;
-    } elsif (isAppleWinWebKit()) {
-        $result = buildVisualStudioProject("$projectName.vcxproj/$projectName.submit.sln");
+    } elsif (isAppleWinWebKit() || isWinCairo()) {
+        # WTF is a part of JavaScriptCore.sln because jsc.exe wouldn't start otherwise.
+        if ($projectName ne "WTF") {
+            $result = buildVisualStudioProject("$projectName.vcxproj/$projectName.sln");
+        }
     } elsif (isGtk()) {
         checkForArgumentAndRemoveFromARGV("--gtk");

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -75 +75 @@
 # FIXME: run-jsc-stress-tests should be ported to other platforms.
 # https://bugs.webkit.org/show_bug.cgi?id=120809
-my $runJSCStress = !isAppleWinWebKit();
+my $runJSCStress = !isAppleWinWebKit() && !isWinCairo();
 
 my $enableFTL = 0;

trunk/Tools/Scripts/webkitdirs.pm

@@ -461 +461 @@
     determineConfiguration();
     # FIXME: We should detect when Debug_All or Production has been chosen.
-    $configurationForVisualStudio = $configuration;
+    $configurationForVisualStudio = $configuration . (isWin64() ? "|x64" : "");
 }
 
@@ -478 +478 @@
     determineBaseProductDir();
     determineConfiguration();
-    if (isAppleWinWebKit()) {
+    if (isAppleWinWebKit() || isWinCairo()) {
         my $binDir = isWin64() ? "bin64" : "bin32";
-        $configurationProductDir = File::Spec->catdir($baseProductDir, configurationForVisualStudio(), $binDir);
+        $configurationProductDir = File::Spec->catdir($baseProductDir, $configuration, $binDir);
     } else {
         if (usesPerConfigurationBuildDirectory()) {
@@ -1214 +1214 @@
 sub isAppleWinWebKit()
 {
-    return isAppleWebKit() && (isCygwin() || isWindows());
+    return isAppleWebKit() && (isCygwin() || isWindows()) && !isWinCairo();
 }
 
@@ -1651 +1651 @@
             $inspectorResourcesDirPath = $productDir . "/WebCore.framework/Resources/inspector";
         }
-    } elsif (isAppleWinWebKit()) {
+    } elsif (isAppleWinWebKit() || isWinCairo()) {
         $inspectorResourcesDirPath = $productDir . "/WebKit.resources/inspector";
     } elsif (isGtk()) {
@@ -2152 +2152 @@
     if (isAppleWinWebKit()) {
         $env->{PATH} = join(':', productDir(), dirname(installedSafariPath()), appleApplicationSupportPath(), $env->{PATH} || "");
+    } elsif (isWinCairo()) {
+        my $winCairoBin = sourceDir() . "/WebKitLibraries/win/" . (isWin64() ? "bin64/" : "bin32/");
+        $env->{PATH} = join(':', productDir(), $winCairoBin , $env->{PATH} || "");
     }
 }