Run JavaScriptCore tests again on Windows.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Oct 2013 22:28:32 +0000 (22:28 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Oct 2013 22:28:32 +0000 (22:28 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157607 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln [new file with mode: 0644]
Source/JavaScriptCore/jit/JITStubsMSVC64.asm
Tools/ChangeLog
Tools/Scripts/build-jsc
Tools/Scripts/run-javascriptcore-tests
Tools/Scripts/webkitdirs.pm

index 7c19c4e..35b4e8a 100644 (file)
@@ -1,3 +1,13 @@
+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>
 
         Removed restoreArgumentReference (another use of JITStackFrame)
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln
new file mode 100644 (file)
index 0000000..6aa8521
--- /dev/null
@@ -0,0 +1,311 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore.vcxproj", "{22413D41-3A18-42B7-92A8-CEDC6CE86920}"
+       ProjectSection(ProjectDependencies) = postProject
+               {9221744B-5715-4F56-9590-42F7AB23DD8B} = {9221744B-5715-4F56-9590-42F7AB23DD8B}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCoreGenerated.vcxproj", "{3670D01F-95F3-45A8-B878-947EB6CF214E}"
+       ProjectSection(ProjectDependencies) = postProject
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5} = {8EF73779-BED3-45BB-816D-9FF58399AFA5}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcxproj", "{2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}"
+       ProjectSection(ProjectDependencies) = postProject
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920} = {22413D41-3A18-42B7-92A8-CEDC6CE86920}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntAssembly", "LLInt\LLIntAssembly\LLIntAssembly.vcxproj", "{9221744B-5715-4F56-9590-42F7AB23DD8B}"
+       ProjectSection(ProjectDependencies) = postProject
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96} = {D595E3F6-24F2-4C60-935C-95D50C6B3E96}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntDesiredOffsets", "LLInt\LLIntDesiredOffsets\LLIntDesiredOffsets.vcxproj", "{877150A0-41B3-4730-9D98-1B8298098B14}"
+       ProjectSection(ProjectDependencies) = postProject
+               {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntOffsetsExtractor", "LLInt\LLIntOffsetsExtractor\LLIntOffsetsExtractor.vcxproj", "{D595E3F6-24F2-4C60-935C-95D50C6B3E96}"
+       ProjectSection(ProjectDependencies) = postProject
+               {877150A0-41B3-4730-9D98-1B8298098B14} = {877150A0-41B3-4730-9D98-1B8298098B14}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "testapi\testapi.vcxproj", "{5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}"
+       ProjectSection(ProjectDependencies) = postProject
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B} = {BB16286B-AADC-46C1-BC0D-6C06F323E04B}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "testRegExp\testRegExp.vcxproj", "{BB16286B-AADC-46C1-BC0D-6C06F323E04B}"
+       ProjectSection(ProjectDependencies) = postProject
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3} = {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\..\WTF\WTF.vcxproj\WTF.vcxproj", "{8EF73779-BED3-45BB-816D-9FF58399AFA5}"
+       ProjectSection(ProjectDependencies) = postProject
+               {F7366596-0520-4433-B8FF-D843E31E5199} = {F7366596-0520-4433-B8FF-D843E31E5199}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTFGenerated", "..\..\WTF\WTF.vcxproj\WTFGenerated.vcxproj", "{F7366596-0520-4433-B8FF-D843E31E5199}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug_WinCairo|Win32 = Debug_WinCairo|Win32
+               Debug_WinCairo|x64 = Debug_WinCairo|x64
+               Debug|Win32 = Debug|Win32
+               Debug|x64 = Debug|x64
+               DebugSuffix|Win32 = DebugSuffix|Win32
+               DebugSuffix|x64 = DebugSuffix|x64
+               Production|Win32 = Production|Win32
+               Production|x64 = Production|x64
+               Release_WinCairo|Win32 = Release_WinCairo|Win32
+               Release_WinCairo|x64 = Release_WinCairo|x64
+               Release|Win32 = Release|Win32
+               Release|x64 = Release|x64
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.ActiveCfg = Debug|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.Build.0 = Debug|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.ActiveCfg = Debug|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.Build.0 = Debug|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.ActiveCfg = Production|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.Build.0 = Production|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.ActiveCfg = Production|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.Build.0 = Production|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.ActiveCfg = Release|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.Build.0 = Release|Win32
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.ActiveCfg = Release|x64
+               {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.Build.0 = Release|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.ActiveCfg = Debug|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.Build.0 = Debug|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.ActiveCfg = Debug|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.Build.0 = Debug|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.ActiveCfg = Production|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.Build.0 = Production|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.ActiveCfg = Production|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.Build.0 = Production|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.ActiveCfg = Release|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.Build.0 = Release|Win32
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.ActiveCfg = Release|x64
+               {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.Build.0 = Release|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.Build.0 = Debug|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.ActiveCfg = Debug|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.Build.0 = Debug|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.ActiveCfg = Production|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.Build.0 = Production|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.ActiveCfg = Production|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.Build.0 = Production|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.ActiveCfg = Release|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.Build.0 = Release|Win32
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.ActiveCfg = Release|x64
+               {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.Build.0 = Release|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.ActiveCfg = Debug|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.Build.0 = Debug|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|x64.ActiveCfg = Debug|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|x64.Build.0 = Debug|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.ActiveCfg = Production|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.Build.0 = Production|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|x64.ActiveCfg = Production|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|x64.Build.0 = Production|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.ActiveCfg = Release|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.Build.0 = Release|Win32
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|x64.ActiveCfg = Release|x64
+               {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|x64.Build.0 = Release|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.ActiveCfg = Debug|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.Build.0 = Debug|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|x64.ActiveCfg = Debug|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|x64.Build.0 = Debug|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.ActiveCfg = Production|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.Build.0 = Production|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Production|x64.ActiveCfg = Production|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Production|x64.Build.0 = Production|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.ActiveCfg = Release|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.Build.0 = Release|Win32
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release|x64.ActiveCfg = Release|x64
+               {877150A0-41B3-4730-9D98-1B8298098B14}.Release|x64.Build.0 = Release|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.ActiveCfg = Debug|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.Build.0 = Debug|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|x64.ActiveCfg = Debug|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|x64.Build.0 = Debug|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.ActiveCfg = Production|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.Build.0 = Production|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|x64.ActiveCfg = Production|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|x64.Build.0 = Production|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.ActiveCfg = Release|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.Build.0 = Release|Win32
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|x64.ActiveCfg = Release|x64
+               {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|x64.Build.0 = Release|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.ActiveCfg = Debug|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.Build.0 = Debug|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.ActiveCfg = Debug|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.Build.0 = Debug|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.ActiveCfg = Production|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.Build.0 = Production|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.ActiveCfg = Production|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.Build.0 = Production|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.ActiveCfg = Release|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.Build.0 = Release|Win32
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.ActiveCfg = Release|x64
+               {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.Build.0 = Release|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.ActiveCfg = Debug|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.Build.0 = Debug|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.ActiveCfg = Debug|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.Build.0 = Debug|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.ActiveCfg = Production|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.Build.0 = Production|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.ActiveCfg = Production|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.Build.0 = Production|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.ActiveCfg = Release|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.Build.0 = Release|Win32
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.ActiveCfg = Release|x64
+               {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.Build.0 = Release|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.ActiveCfg = Debug|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.Build.0 = Debug|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.ActiveCfg = Debug|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.Build.0 = Debug|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.ActiveCfg = Production|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.Build.0 = Production|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.ActiveCfg = Production|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.Build.0 = Production|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.ActiveCfg = Release|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.Build.0 = Release|Win32
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.ActiveCfg = Release|x64
+               {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.Build.0 = Release|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.Build.0 = Debug|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.ActiveCfg = Debug|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.Build.0 = Debug|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.ActiveCfg = Production|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.Build.0 = Production|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.ActiveCfg = Production|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.Build.0 = Production|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.ActiveCfg = Release|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.Build.0 = Release|Win32
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.ActiveCfg = Release|x64
+               {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.Build.0 = Release|x64
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal
index 5a3f219..2ffadd4 100644 (file)
@@ -23,7 +23,6 @@
 ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;*/
 
-EXTERN cti_vm_throw : near
 EXTERN cti_vm_handle_exception : near
 EXTERN getHostCallReturnValueWithExecState : near
 
index f444087..00cf749 100644 (file)
@@ -1,3 +1,22 @@
+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>
 
         Unreviewed. Add myself as a reviewer.
index fc0d5da..f07d309 100755 (executable)
@@ -84,8 +84,11 @@ sub buildMyProject
     chdir $projectDirectory or die "Can't find $projectName directory to build from";
     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");
         $result = buildGtkProject($projectName, 0);
index f3bfbba..973821a 100755 (executable)
@@ -74,7 +74,7 @@ my $runMozilla = 0;
 
 # 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;
 
index f6a8a6a..47257f8 100755 (executable)
@@ -460,7 +460,7 @@ sub determineConfigurationForVisualStudio
     return if defined $configurationForVisualStudio;
     determineConfiguration();
     # FIXME: We should detect when Debug_All or Production has been chosen.
-    $configurationForVisualStudio = $configuration;
+    $configurationForVisualStudio = $configuration . (isWin64() ? "|x64" : "");
 }
 
 sub usesPerConfigurationBuildDirectory
@@ -477,9 +477,9 @@ sub determineConfigurationProductDir
     return if defined $configurationProductDir;
     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()) {
             $configurationProductDir = "$baseProductDir";
@@ -1213,7 +1213,7 @@ sub isAppleMacWebKit()
 
 sub isAppleWinWebKit()
 {
-    return isAppleWebKit() && (isCygwin() || isWindows());
+    return isAppleWebKit() && (isCygwin() || isWindows()) && !isWinCairo();
 }
 
 sub willUseIOSDeviceSDKWhenBuilding()
@@ -1650,7 +1650,7 @@ sub copyInspectorFrontendFiles
         } else {
             $inspectorResourcesDirPath = $productDir . "/WebCore.framework/Resources/inspector";
         }
-    } elsif (isAppleWinWebKit()) {
+    } elsif (isAppleWinWebKit() || isWinCairo()) {
         $inspectorResourcesDirPath = $productDir . "/WebKit.resources/inspector";
     } elsif (isGtk()) {
         my $prefix = $ENV{"WebKitInstallationPrefix"};
@@ -2151,6 +2151,9 @@ sub setPathForRunningWebKitApp
 
     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} || "");
     }
 }