TestWebKitAPI breaks on Windows due to fast malloc incompatibility.
authordslomov@google.com <dslomov@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Aug 2011 19:08:10 +0000 (19:08 +0000)
committerdslomov@google.com <dslomov@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Aug 2011 19:08:10 +0000 (19:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=66521

This patch ensures that gtest uses new and delete operators that are defined in JavaScriptCore.

Reviewed by David Levin.

* gtest/include/gtest/internal/gtest-port.h:
* gtest/msvc/gtest-md.vcproj:
* gtest/README.WebKit:
* gtest/xcode/Config/General.xcconfig:
* gtest/xcode/gtest.xcodeproj/project.pbxproj:

Tools:

This patch ensures that gtest uses new and delete operators that are defined in JavaScriptCore.
https://bugs.webkit.org/show_bug.cgi?id=66521

Reviewed by David Levin.

* TestWebKitAPI/Tests/WTF/StringOperators.cpp: Removed redefinition of JS_EXPORTDATA.

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

Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/README.WebKit
Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
Source/ThirdParty/gtest/msvc/gtest-md.vcproj
Source/ThirdParty/gtest/xcode/Config/General.xcconfig
Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp

index 77589f6..175afed 100644 (file)
@@ -1,3 +1,18 @@
+2011-08-18  Dmitry Lomov  <dslomov@google.com>
+
+        TestWebKitAPI breaks on Windows due to fast malloc incompatibility.
+        https://bugs.webkit.org/show_bug.cgi?id=66521
+
+        This patch ensures that gtest uses new and delete operators that are defined in JavaScriptCore.
+
+        Reviewed by David Levin.
+
+        * gtest/include/gtest/internal/gtest-port.h:
+        * gtest/msvc/gtest-md.vcproj:
+        * gtest/README.WebKit:
+        * gtest/xcode/Config/General.xcconfig:
+        * gtest/xcode/gtest.xcodeproj/project.pbxproj:
+
 2011-08-09  Mark Rowe  <mrowe@apple.com>
 
         Fix gtest to compile in the release configuration with clang.
index ddf2184..8d7cd47 100644 (file)
@@ -2,5 +2,10 @@ GTest v.1.5.0
 
 http://googletest.googlecode.com/svn/tags/release-1.5.0/ 
 
+2011-08-19 Dmitry Lomov (dslomov@google.com)
+      - WebKit port of gtest uses universal "new" and "delete" operators from JavaScriptCore.
+      - removed all dynamic targets from gtest.xcodeproject (we only build static libgtest.a 
+        and statically-linked gtest unit-test runner).
+
 2011-05-06 Dmitry Lomov (dslomov@google.com)
       gtest-md.vcproj upgraded to VS 2005 (8.0) format to match the rest of WebKit
index 7924437..4bab8df 100644 (file)
 #include <sys/stat.h>
 #endif  // !_WIN32_WCE
 
+#include <wtf/Platform.h>
+
+#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
+#define JS_EXPORTDATA __declspec(dllimport)
+#define WEBKIT_EXPORTDATA __declspec(dllimport)
+#define WTF_EXPORT_PRIVATE
+#define JS_EXPORT_PRIVATE
+#define JS_EXPORTCLASS JS_EXPORTDATA
+#else
+#define JS_EXPORTDATA
+#define JS_EXPORTCLASS
+#define WEBKIT_EXPORTDATA
+#define WTF_EXPORT_PRIVATE
+#define JS_EXPORT_PRIVATE
+#endif
+
+#include <wtf/FastMalloc.h>
+
 #include <iostream>  // NOLINT
 #include <sstream>  // NOLINT
 #include <string>  // NOLINT
index d88d001..6c987e9 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(ConfigurationBuildDir)\lib"
                        IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
+                       InheritedPropertySheets="&quot;$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops&quot;"
                        CharacterSet="2"
                        >
                        <Tool
@@ -40,6 +40,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                Optimization="0"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="true"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                Optimization="0"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="true"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;"
                                Optimization="0"
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                                MinimalRebuild="true"
index a2b6c0b..da8e6d8 100644 (file)
@@ -10,6 +10,8 @@
 // Build for PPC and Intel, 32- and 64-bit
 ARCHS = i386 x86_64
 
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders/ForwardingHeaders ../ ../include/
+
 // Zerolink prevents link warnings so turn it off
 ZERO_LINK = NO
 
index 4234e72..80e9bbb 100644 (file)
                                3B238F5E0E828B5400846E11 /* ShellScript */,
                        );
                        dependencies = (
-                               40899F9D0FFA740F000B29AE /* PBXTargetDependency */,
                                40C849F7101A43440083642A /* PBXTargetDependency */,
-                               4089A0980FFAD34A000B29AE /* PBXTargetDependency */,
-                               40C849F9101A43490083642A /* PBXTargetDependency */,
                        );
                        name = Check;
                        productName = Check;
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-               224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */ = {isa = PBXBuildFile; fileRef = 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */; };
-               3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DB0E2F799B00CF7658 /* gtest-death-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               404884390E2F799B00CF7658 /* gtest-message.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DC0E2F799B00CF7658 /* gtest-message.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DD0E2F799B00CF7658 /* gtest-spi.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               4048843B0E2F799B00CF7658 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DE0E2F799B00CF7658 /* gtest.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883E00E2F799B00CF7658 /* gtest_prod.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               404884500E2F799B00CF7658 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README */; };
-               404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */; };
-               404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E30E2F799B00CF7658 /* gtest-filepath.h */; };
-               404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E40E2F799B00CF7658 /* gtest-internal.h */; };
-               404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E50E2F799B00CF7658 /* gtest-port.h */; };
-               404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E60E2F799B00CF7658 /* gtest-string.h */; };
-               404884AC0E2F7CD900CF7658 /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 404884A90E2F7CD900CF7658 /* CHANGES */; };
-               404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */ = {isa = PBXBuildFile; fileRef = 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */; };
-               404884AE0E2F7CD900CF7658 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* COPYING */; };
-               40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; };
-               40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 40899F4D0FFA7271000B29AE /* gtest-tuple.h */; };
-               40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; };
-               4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; };
-               4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; };
                40C848FF101A21150083642A /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; };
                40C84915101A21DF0083642A /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4048840D0E2F799B00CF7658 /* gtest_main.cc */; };
-               40C84916101A235B0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
-               40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
-               40C84978101A36540083642A /* libgtest_main.a in Resources */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
                40C84980101A36850083642A /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; };
                40C84982101A36850083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; };
                40C84983101A36850083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
-               40C8498F101A36A60083642A /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; };
-               40C84990101A36A60083642A /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; };
-               40C84992101A36A60083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; };
-               40C84993101A36A60083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
-               40C849A2101A37050083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; };
-               40C849A4101A37150083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; };
-               4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 4539C9330EC280AE00A70F4C /* gtest-param-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */; };
-               4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */; };
-               4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9370EC280E200A70F4C /* gtest-param-util.h */; };
+               F38599A313FEE001001BD872 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F385987A13FEDE8F001BD872 /* JavaScriptCore.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-               40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 40899F420FFA7184000B29AE;
-                       remoteInfo = gtest_unittest;
-               };
-               4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4089A0120FFACEFC000B29AE;
-                       remoteInfo = sample1_unittest;
-               };
-               408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 40C848F9101A209C0083642A;
-                       remoteInfo = "gtest-static";
-               };
-               40C44AE50E379922008FCC51 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 40C44ADC0E3798F4008FCC51;
-                       remoteInfo = Version.h;
-               };
                40C8497C101A36850083642A /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        remoteGlobalIDString = 40C8490A101A217E0083642A;
                        remoteInfo = "gtest_main-static";
                };
-               40C8498B101A36A60083642A /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 40C848F9101A209C0083642A;
-                       remoteInfo = "gtest-static";
-               };
-               40C8498D101A36A60083642A /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 40C8490A101A217E0083642A;
-                       remoteInfo = "gtest_main-static";
-               };
-               40C8499B101A36DC0083642A /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 40C8490A101A217E0083642A;
-                       remoteInfo = "gtest_main-static";
-               };
-               40C8499D101A36E50083642A /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0;
-                       remoteInfo = "gtest-framework";
-               };
-               40C8499F101A36F10083642A /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0;
-                       remoteInfo = "gtest-framework";
-               };
                40C849F6101A43440083642A /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        remoteGlobalIDString = 40C8497A101A36850083642A;
                        remoteInfo = "gtest_unittest-static";
                };
-               40C849F8101A43490083642A /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 40C84989101A36A60083642A;
-                       remoteInfo = "sample1_unittest-static";
-               };
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-               404884A50E2F7C0400CF7658 /* Copy Headers Internal */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = Headers/internal;
-                       dstSubfolderSpec = 6;
-                       files = (
-                               404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */,
-                               404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */,
-                               404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */,
-                               4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */,
-                               4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */,
-                               4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */,
-                               404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */,
-                               404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */,
-                               40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */,
-                               3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */,
-                       );
-                       name = "Copy Headers Internal";
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
                224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = "<group>"; };
                224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "gtest-test-part.h"; sourceTree = "<group>"; };
                404884A90E2F7CD900CF7658 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CHANGES; path = ../CHANGES; sourceTree = SOURCE_ROOT; };
                404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../CONTRIBUTORS; sourceTree = SOURCE_ROOT; };
                404884AB0E2F7CD900CF7658 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../COPYING; sourceTree = SOURCE_ROOT; };
-               40899F430FFA7184000B29AE /* gtest_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gtest_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; };
                40899F4D0FFA7271000B29AE /* gtest-tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-tuple.h"; sourceTree = "<group>"; };
                40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = StaticLibraryTarget.xcconfig; sourceTree = "<group>"; };
-               4089A0130FFACEFC000B29AE /* sample1_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; };
                4089A02C0FFACF7F000B29AE /* sample1.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample1.cc; sourceTree = "<group>"; };
                4089A02D0FFACF7F000B29AE /* sample1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample1.h; sourceTree = "<group>"; };
                4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample1_unittest.cc; sourceTree = "<group>"; };
                40C848FA101A209C0083642A /* libgtest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
                40C8490B101A217E0083642A /* libgtest_main.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest_main.a; sourceTree = BUILT_PRODUCTS_DIR; };
                40C84987101A36850083642A /* gtest_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gtest_unittest; sourceTree = BUILT_PRODUCTS_DIR; };
-               40C84997101A36A60083642A /* sample1_unittest-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-static"; sourceTree = BUILT_PRODUCTS_DIR; };
                40D4CDF10E30E07400294801 /* DebugProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugProject.xcconfig; sourceTree = "<group>"; };
                40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FrameworkTarget.xcconfig; sourceTree = "<group>"; };
                40D4CDF30E30E07400294801 /* General.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = General.xcconfig; sourceTree = "<group>"; };
                40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseProject.xcconfig; sourceTree = "<group>"; };
                40D4CF510E30F5E200294801 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-               4539C8FF0EC27F6400A70F4C /* gtest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = gtest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                4539C9330EC280AE00A70F4C /* gtest-param-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-test.h"; sourceTree = "<group>"; };
                4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-linked_ptr.h"; sourceTree = "<group>"; };
                4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util-generated.h"; sourceTree = "<group>"; };
                4539C9370EC280E200A70F4C /* gtest-param-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util.h"; sourceTree = "<group>"; };
+               F385987A13FEDE8F001BD872 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-               40899F410FFA7184000B29AE /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               40C849A4101A37150083642A /* gtest.framework in Frameworks */,
-                               40C84916101A235B0083642A /* libgtest_main.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               4089A0110FFACEFC000B29AE /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               40C849A2101A37050083642A /* gtest.framework in Frameworks */,
-                               40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                40C84981101A36850083642A /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               F38599A313FEE001001BD872 /* JavaScriptCore.framework in Frameworks */,
                                40C84982101A36850083642A /* libgtest.a in Frameworks */,
                                40C84983101A36850083642A /* libgtest_main.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               40C84991101A36A60083642A /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               40C84992101A36A60083642A /* libgtest.a in Frameworks */,
-                               40C84993101A36A60083642A /* libgtest_main.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
                034768DDFF38A45A11DB9C8B /* Products */ = {
                        isa = PBXGroup;
                        children = (
-                               4539C8FF0EC27F6400A70F4C /* gtest.framework */,
                                40C848FA101A209C0083642A /* libgtest.a */,
                                40C8490B101A217E0083642A /* libgtest_main.a */,
-                               40899F430FFA7184000B29AE /* gtest_unittest-framework */,
                                40C84987101A36850083642A /* gtest_unittest */,
-                               4089A0130FFACEFC000B29AE /* sample1_unittest-framework */,
-                               40C84997101A36A60083642A /* sample1_unittest-static */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                                40D4CF4E0E30F5E200294801 /* Resources */,
                                403EE37B0E377822004BD1E2 /* Scripts */,
                                034768DDFF38A45A11DB9C8B /* Products */,
+                               F385987A13FEDE8F001BD872 /* JavaScriptCore.framework */,
                        );
                        name = gtest;
                        sourceTree = "<group>";
                };
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-               8D07F2BD0486CC7A007CD1D0 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */,
-                               404884390E2F799B00CF7658 /* gtest-message.h in Headers */,
-                               4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */,
-                               3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */,
-                               4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */,
-                               4048843B0E2F799B00CF7658 /* gtest.h in Headers */,
-                               4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */,
-                               4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */,
-                               224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
-               40899F420FFA7184000B29AE /* gtest_unittest-framework */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */;
-                       buildPhases = (
-                               40899F400FFA7184000B29AE /* Sources */,
-                               40899F410FFA7184000B29AE /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               40C849A0101A36F10083642A /* PBXTargetDependency */,
-                       );
-                       name = "gtest_unittest-framework";
-                       productName = gtest_unittest;
-                       productReference = 40899F430FFA7184000B29AE /* gtest_unittest-framework */;
-                       productType = "com.apple.product-type.tool";
-               };
-               4089A0120FFACEFC000B29AE /* sample1_unittest-framework */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */;
-                       buildPhases = (
-                               4089A0100FFACEFC000B29AE /* Sources */,
-                               4089A0110FFACEFC000B29AE /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               40C8499E101A36E50083642A /* PBXTargetDependency */,
-                       );
-                       name = "sample1_unittest-framework";
-                       productName = sample1_unittest;
-                       productReference = 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */;
-                       productType = "com.apple.product-type.tool";
-               };
                40C848F9101A209C0083642A /* gtest-static */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 40C84902101A212E0083642A /* Build configuration list for PBXNativeTarget "gtest-static" */;
                        productReference = 40C84987101A36850083642A /* gtest_unittest */;
                        productType = "com.apple.product-type.tool";
                };
-               40C84989101A36A60083642A /* sample1_unittest-static */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */;
-                       buildPhases = (
-                               40C8498E101A36A60083642A /* Sources */,
-                               40C84991101A36A60083642A /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               40C8498A101A36A60083642A /* PBXTargetDependency */,
-                               40C8498C101A36A60083642A /* PBXTargetDependency */,
-                       );
-                       name = "sample1_unittest-static";
-                       productName = sample1_unittest;
-                       productReference = 40C84997101A36A60083642A /* sample1_unittest-static */;
-                       productType = "com.apple.product-type.tool";
-               };
-               8D07F2BC0486CC7A007CD1D0 /* gtest-framework */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */;
-                       buildPhases = (
-                               8D07F2C10486CC7A007CD1D0 /* Sources */,
-                               8D07F2BD0486CC7A007CD1D0 /* Headers */,
-                               404884A50E2F7C0400CF7658 /* Copy Headers Internal */,
-                               8D07F2BF0486CC7A007CD1D0 /* Resources */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               40C44AE60E379922008FCC51 /* PBXTargetDependency */,
-                               408BEC101046CFE900DEF522 /* PBXTargetDependency */,
-                               40C8499C101A36DC0083642A /* PBXTargetDependency */,
-                       );
-                       name = "gtest-framework";
-                       productInstallPath = "$(HOME)/Library/Frameworks";
-                       productName = gtest;
-                       productReference = 4539C8FF0EC27F6400A70F4C /* gtest.framework */;
-                       productType = "com.apple.product-type.framework";
-               };
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
                        isa = PBXProject;
                        buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */;
                        compatibilityVersion = "Xcode 2.4";
+                       developmentRegion = English;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                        projectDirPath = "";
                        projectRoot = "";
                        targets = (
-                               8D07F2BC0486CC7A007CD1D0 /* gtest-framework */,
                                40C848F9101A209C0083642A /* gtest-static */,
                                40C8490A101A217E0083642A /* gtest_main-static */,
-                               40899F420FFA7184000B29AE /* gtest_unittest-framework */,
                                40C8497A101A36850083642A /* gtest_unittest-static */,
-                               4089A0120FFACEFC000B29AE /* sample1_unittest-framework */,
-                               40C84989101A36A60083642A /* sample1_unittest-static */,
                                3B238F5F0E828B5400846E11 /* Check */,
                                40C44ADC0E3798F4008FCC51 /* Version Info */,
                        );
                };
 /* End PBXProject section */
 
-/* Begin PBXResourcesBuildPhase section */
-               8D07F2BF0486CC7A007CD1D0 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               404884500E2F799B00CF7658 /* README in Resources */,
-                               404884AC0E2F7CD900CF7658 /* CHANGES in Resources */,
-                               404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */,
-                               404884AE0E2F7CD900CF7658 /* COPYING in Resources */,
-                               40C84978101A36540083642A /* libgtest_main.a in Resources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXResourcesBuildPhase section */
-
 /* Begin PBXShellScriptBuildPhase section */
                3B238F5E0E828B5400846E11 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-               40899F400FFA7184000B29AE /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               4089A0100FFACEFC000B29AE /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */,
-                               4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                40C848F7101A209C0083642A /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               40C8498E101A36A60083642A /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               40C8498F101A36A60083642A /* sample1.cc in Sources */,
-                               40C84990101A36A60083642A /* sample1_unittest.cc in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               8D07F2C10486CC7A007CD1D0 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-               40899F9D0FFA740F000B29AE /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 40899F420FFA7184000B29AE /* gtest_unittest-framework */;
-                       targetProxy = 40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */;
-               };
-               4089A0980FFAD34A000B29AE /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */;
-                       targetProxy = 4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */;
-               };
-               408BEC101046CFE900DEF522 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 40C848F9101A209C0083642A /* gtest-static */;
-                       targetProxy = 408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */;
-               };
-               40C44AE60E379922008FCC51 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 40C44ADC0E3798F4008FCC51 /* Version Info */;
-                       targetProxy = 40C44AE50E379922008FCC51 /* PBXContainerItemProxy */;
-               };
                40C8497B101A36850083642A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 40C848F9101A209C0083642A /* gtest-static */;
                        target = 40C8490A101A217E0083642A /* gtest_main-static */;
                        targetProxy = 40C8497E101A36850083642A /* PBXContainerItemProxy */;
                };
-               40C8498A101A36A60083642A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 40C848F9101A209C0083642A /* gtest-static */;
-                       targetProxy = 40C8498B101A36A60083642A /* PBXContainerItemProxy */;
-               };
-               40C8498C101A36A60083642A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 40C8490A101A217E0083642A /* gtest_main-static */;
-                       targetProxy = 40C8498D101A36A60083642A /* PBXContainerItemProxy */;
-               };
-               40C8499C101A36DC0083642A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 40C8490A101A217E0083642A /* gtest_main-static */;
-                       targetProxy = 40C8499B101A36DC0083642A /* PBXContainerItemProxy */;
-               };
-               40C8499E101A36E50083642A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */;
-                       targetProxy = 40C8499D101A36E50083642A /* PBXContainerItemProxy */;
-               };
-               40C849A0101A36F10083642A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */;
-                       targetProxy = 40C8499F101A36F10083642A /* PBXContainerItemProxy */;
-               };
                40C849F7101A43440083642A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 40C8497A101A36850083642A /* gtest_unittest-static */;
                        targetProxy = 40C849F6101A43440083642A /* PBXContainerItemProxy */;
                };
-               40C849F9101A43490083642A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 40C84989101A36A60083642A /* sample1_unittest-static */;
-                       targetProxy = 40C849F8101A43490083642A /* PBXContainerItemProxy */;
-               };
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
                        };
                        name = Release;
                };
-               40899F450FFA7185000B29AE /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               HEADER_SEARCH_PATHS = ../;
-                               PRODUCT_NAME = "gtest_unittest-framework";
-                       };
-                       name = Debug;
-               };
-               40899F460FFA7185000B29AE /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               HEADER_SEARCH_PATHS = ../;
-                               PRODUCT_NAME = "gtest_unittest-framework";
-                       };
-                       name = Release;
-               };
-               4089A0150FFACEFD000B29AE /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "sample1_unittest-framework";
-                       };
-                       name = Debug;
-               };
-               4089A0160FFACEFD000B29AE /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "sample1_unittest-framework";
-                       };
-                       name = Release;
-               };
                40C44ADF0E3798F4008FCC51 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        buildSettings = {
                                GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-                               HEADER_SEARCH_PATHS = (
-                                       ../,
-                                       ../include/,
-                               );
                                PRODUCT_NAME = gtest;
                        };
                        name = Debug;
                        buildSettings = {
                                GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-                               HEADER_SEARCH_PATHS = (
-                                       ../,
-                                       ../include/,
-                               );
                                PRODUCT_NAME = gtest;
                        };
                        name = Release;
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = (
-                                       ../,
-                                       ../include/,
-                               );
                                PRODUCT_NAME = gtest_main;
                        };
                        name = Debug;
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = (
-                                       ../,
-                                       ../include/,
-                               );
                                PRODUCT_NAME = gtest_main;
                        };
                        name = Release;
                40C84985101A36850083642A /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = ../;
+                               ARCHS = "$(NATIVE_ARCH_ACTUAL)";
                                PRODUCT_NAME = gtest_unittest;
                        };
                        name = Debug;
                40C84986101A36850083642A /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               HEADER_SEARCH_PATHS = ../;
+                               ARCHS = "$(NATIVE_ARCH_ACTUAL)";
                                PRODUCT_NAME = gtest_unittest;
                        };
                        name = Release;
                };
-               40C84995101A36A60083642A /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "sample1_unittest-static";
-                       };
-                       name = Debug;
-               };
-               40C84996101A36A60083642A /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "sample1_unittest-static";
-                       };
-                       name = Release;
-               };
-               4FADC24308B4156D00ABE55E /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
-                       buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               HEADER_SEARCH_PATHS = (
-                                       ../,
-                                       ../include/,
-                               );
-                               INFOPLIST_FILE = Resources/Info.plist;
-                               INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h";
-                               INFOPLIST_PREPROCESS = YES;
-                               PRODUCT_NAME = gtest;
-                               VERSIONING_SYSTEM = "apple-generic";
-                       };
-                       name = Debug;
-               };
-               4FADC24408B4156D00ABE55E /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
-                       buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               HEADER_SEARCH_PATHS = (
-                                       ../,
-                                       ../include/,
-                               );
-                               INFOPLIST_FILE = Resources/Info.plist;
-                               INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h";
-                               INFOPLIST_PREPROCESS = YES;
-                               PRODUCT_NAME = gtest;
-                               VERSIONING_SYSTEM = "apple-generic";
-                       };
-                       name = Release;
-               };
                4FADC24708B4156D00ABE55E /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */;
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               40899F450FFA7185000B29AE /* Debug */,
-                               40899F460FFA7185000B29AE /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               4089A0150FFACEFD000B29AE /* Debug */,
-                               4089A0160FFACEFD000B29AE /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
                40C44AE40E379905008FCC51 /* Build configuration list for PBXAggregateTarget "Version Info" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               40C84995101A36A60083642A /* Debug */,
-                               40C84996101A36A60083642A /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               4FADC24308B4156D00ABE55E /* Debug */,
-                               4FADC24408B4156D00ABE55E /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
                4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
index a33ab36..0cbf748 100644 (file)
@@ -1,3 +1,14 @@
+2011-08-18  Dmitry Lomov  <dslomov@google.com>
+
+        TestWebKitAPI breaks on Windows due to fast malloc incompatibility.
+        https://bugs.webkit.org/show_bug.cgi?id=66521
+
+        This patch ensures that gtest uses new and delete operators that are defined in JavaScriptCore.
+
+        Reviewed by David Levin.
+
+        * TestWebKitAPI/Tests/WTF/StringOperators.cpp: Removed redefinition of JS_EXPORTDATA.
+
 2011-08-19  Adam Roben  <aroben@apple.com>
 
         Add project file changes I left out in r93417
index 985964b..db3243a 100644 (file)
@@ -23,7 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define JS_EXPORTDATA
 #define WTF_STRINGTYPEADAPTER_COPIED_WTF_STRING() (++wtfStringCopyCount)
 
 static int wtfStringCopyCount;