Diff
Modified: trunk/Source/ThirdParty/ChangeLog (104090 => 104091)
--- trunk/Source/ThirdParty/ChangeLog 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/ChangeLog 2012-01-05 00:15:09 UTC (rev 104091)
@@ -1,3 +1,35 @@
+2012-01-04 David Kilzer <[email protected]>
+
+ TestWebKitAPI has issues due to FastMalloc incompatibility
+ <http://webkit.org/b/66521>
+ <rdar://problem/10607911>
+
+ Reviewed by David Levin.
+
+ Original patch by Dmitry Lomov <[email protected]>.
+
+ This patch ensures that gtest uses the FastMalloc new and delete
+ operators that are defined in _javascript_Core.
+
+ * gtest/README.WebKit: Update with project changes.
+ * gtest/include/gtest/internal/gtest-port.h: Import necessary
+ headers to use FastMalloc in gtest.
+ * gtest/msvc/gtest-md.vcproj: Add include directories to find
+ WTF headers.
+ * gtest/xcode/Config/DebugProject.xcconfig: Define
+ WEBCORE_PRIVATE_HEADERS_DIR for Debug builds.
+ * gtest/xcode/Config/General.xcconfig: Define
+ HEADER_SEARCH_PATHS in terms of WEBCORE_PRIVATE_HEADERS_DIR.
+ * gtest/xcode/Config/ProductionProject.xcconfig: Define
+ WEBCORE_PRIVATE_HEADERS_DIR for Production builds. This
+ overrides the value in ReleaseProject.xcconfig.
+ * gtest/xcode/Config/ReleaseProject.xcconfig: Define
+ WEBCORE_PRIVATE_HEADERS_DIR for Release builds.
+ * gtest/xcode/gtest.xcodeproj/project.pbxproj:
+ - Remove local HEADER_SEARCH_PATHS definitions.
+ - Link to _javascript_Core.framework when building
+ gtest.framework.
+
2012-01-03 David Kilzer <[email protected]>
Add Production configuration to gtest Xcode project
Modified: trunk/Source/ThirdParty/gtest/README.WebKit (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/README.WebKit 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/README.WebKit 2012-01-05 00:15:09 UTC (rev 104091)
@@ -2,6 +2,10 @@
http://googletest.googlecode.com/svn/tags/release-1.5.0/
+2012-01-04 Dmitry Lomov ([email protected]) David Kilzer ([email protected])
+ - WebKit port of gtest uses FastMalloc "new" and "delete" operators from _javascript_Core.
+ - The gtest.framework target now links to _javascript_Core.framework.
+
2011-12-22 David Kilzer ([email protected])
Added Production configuration to gtest Xcode project.
Modified: trunk/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h 2012-01-05 00:15:09 UTC (rev 104091)
@@ -177,6 +177,14 @@
#include <sys/stat.h>
#endif // !_WIN32_WCE
+#include <wtf/Platform.h>
+#include <wtf/ExportMacros.h>
+#if USE(JSC)
+#include <runtime/JSExportMacros.h>
+#endif
+#include <wtf/Assertions.h>
+#include <wtf/FastMalloc.h>
+
#include <iostream> // NOLINT
#include <sstream> // NOLINT
#include <string> // NOLINT
Modified: trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcproj (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcproj 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcproj 2012-01-05 00:15:09 UTC (rev 104091)
@@ -20,7 +20,7 @@
OutputDirectory="$(ConfigurationBuildDir)\lib"
IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
ConfigurationType="4"
- InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
+ InheritedPropertySheets=""$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops""
CharacterSet="2"
>
<Tool
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
@@ -103,6 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -164,6 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
@@ -228,6 +231,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -289,6 +293,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -350,6 +355,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private""
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2012-01-05 00:15:09 UTC (rev 104091)
@@ -28,3 +28,6 @@
// These are turned off to avoid STL incompatibilities with client code
// // Turns on special C++ STL checks to "encourage" good STL use
// GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS
+
+// Used by HEADER_SEARCH_PATHS in General.xcconfig
+WEBCORE_PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2012-01-05 00:15:09 UTC (rev 104091)
@@ -12,6 +12,8 @@
// Not building PowerPC any more
ARCHS = i386 x86_64
+HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ../ ../include/
+
// Zerolink prevents link warnings so turn it off
ZERO_LINK = NO
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig 2012-01-05 00:15:09 UTC (rev 104091)
@@ -10,3 +10,5 @@
#include "ReleaseProject.xcconfig"
+// Used by HEADER_SEARCH_PATHS in General.xcconfig
+WEBCORE_PRIVATE_HEADERS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/PrivateHeaders;
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2012-01-05 00:15:09 UTC (rev 104091)
@@ -30,3 +30,6 @@
// When we strip we want to strip all symbols in release, but save externals.
STRIP_STYLE = all
+
+// Used by HEADER_SEARCH_PATHS in General.xcconfig
+WEBCORE_PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
Modified: trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (104090 => 104091)
--- trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2012-01-05 00:10:18 UTC (rev 104090)
+++ trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2012-01-05 00:15:09 UTC (rev 104091)
@@ -74,6 +74,7 @@
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 */; };
+ 444D117514A262FB009FEC3F /* _javascript_Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 444D117414A262FB009FEC3F /* _javascript_Core.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 */; };
@@ -237,6 +238,7 @@
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>"; };
+ 444D117414A262FB009FEC3F /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = _javascript_Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
44C48DFF14A4098F00A2D9C7 /* ProductionProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ProductionProject.xcconfig; 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>"; };
@@ -282,6 +284,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 444D117214A2628F009FEC3F /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 444D117514A262FB009FEC3F /* _javascript_Core.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -302,6 +312,7 @@
0867D691FE84028FC02AAC07 /* gtest */ = {
isa = PBXGroup;
children = (
+ 444D117414A262FB009FEC3F /* _javascript_Core.framework */,
40D4CDF00E30E07400294801 /* Config */,
08FB77ACFE841707C02AAC07 /* Source */,
40D4CF4E0E30F5E200294801 /* Resources */,
@@ -559,6 +570,7 @@
8D07F2BD0486CC7A007CD1D0 /* Headers */,
404884A50E2F7C0400CF7658 /* Copy Headers Internal */,
8D07F2BF0486CC7A007CD1D0 /* Resources */,
+ 444D117214A2628F009FEC3F /* Frameworks */,
);
buildRules = (
);
@@ -809,7 +821,6 @@
40899F450FFA7185000B29AE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = "gtest_unittest-framework";
};
name = Debug;
@@ -817,7 +828,6 @@
40899F460FFA7185000B29AE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = "gtest_unittest-framework";
};
name = Release;
@@ -858,10 +868,6 @@
buildSettings = {
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- HEADER_SEARCH_PATHS = (
- ../,
- ../include/,
- );
PRODUCT_NAME = gtest;
};
name = Debug;
@@ -872,10 +878,6 @@
buildSettings = {
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- HEADER_SEARCH_PATHS = (
- ../,
- ../include/,
- );
PRODUCT_NAME = gtest;
};
name = Release;
@@ -884,10 +886,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
buildSettings = {
- HEADER_SEARCH_PATHS = (
- ../,
- ../include/,
- );
PRODUCT_NAME = gtest_main;
};
name = Debug;
@@ -896,10 +894,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
buildSettings = {
- HEADER_SEARCH_PATHS = (
- ../,
- ../include/,
- );
PRODUCT_NAME = gtest_main;
};
name = Release;
@@ -907,7 +901,6 @@
40C84985101A36850083642A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = gtest_unittest;
};
name = Debug;
@@ -915,7 +908,6 @@
40C84986101A36850083642A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = gtest_unittest;
};
name = Release;
@@ -1040,10 +1032,6 @@
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;
@@ -1058,10 +1046,6 @@
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;
