summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--media/media.xcodeproj/project.pbxproj4
-rw-r--r--net/net.xcodeproj/project.pbxproj4
-rw-r--r--testing/SConscript.gtest1
-rw-r--r--testing/gtest.vcproj184
-rw-r--r--testing/gtest.xcodeproj/project.pbxproj4
6 files changed, 128 insertions, 71 deletions
diff --git a/DEPS b/DEPS
index 98fa0c3..a27b92c 100644
--- a/DEPS
+++ b/DEPS
@@ -9,7 +9,7 @@ deps = {
"http://open-vcdiff.googlecode.com/svn/trunk@22",
"src/testing/gtest":
- "http://googletest.googlecode.com/svn/trunk@63",
+ "http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
"/trunk/deps/third_party/WebKit@7634",
diff --git a/media/media.xcodeproj/project.pbxproj b/media/media.xcodeproj/project.pbxproj
index 19578c5..4f8b384 100644
--- a/media/media.xcodeproj/project.pbxproj
+++ b/media/media.xcodeproj/project.pbxproj
@@ -757,9 +757,9 @@
HEADER_SEARCH_PATHS = (
"$(HEADER_SEARCH_PATHS)",
..,
- "../sdch/open-vcdiff/src",
../testing/gtest/include,
../testing/gtest/include/gtest,
+ "../sdch/open-vcdiff/src",
);
PRODUCT_NAME = media_unittests;
};
@@ -776,9 +776,9 @@
HEADER_SEARCH_PATHS = (
"$(HEADER_SEARCH_PATHS)",
..,
- "../sdch/open-vcdiff/src",
../testing/gtest/include,
../testing/gtest/include/gtest,
+ "../sdch/open-vcdiff/src",
);
PRODUCT_NAME = media_unittests;
};
diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index 917a77c..f0ead56 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -1763,9 +1763,9 @@
HEADER_SEARCH_PATHS = (
"$(HEADER_SEARCH_PATHS)",
..,
- "../sdch/open-vcdiff/src",
../testing/gtest/include,
../testing/gtest/include/gtest,
+ "../sdch/open-vcdiff/src",
);
PRODUCT_NAME = net_unittests;
};
@@ -1782,9 +1782,9 @@
HEADER_SEARCH_PATHS = (
"$(HEADER_SEARCH_PATHS)",
..,
- "../sdch/open-vcdiff/src",
../testing/gtest/include,
../testing/gtest/include/gtest,
+ "../sdch/open-vcdiff/src",
);
PRODUCT_NAME = net_unittests;
};
diff --git a/testing/SConscript.gtest b/testing/SConscript.gtest
index 870bf51..96a66e8 100644
--- a/testing/SConscript.gtest
+++ b/testing/SConscript.gtest
@@ -40,6 +40,7 @@ input_files = ChromeFileList([
'gtest/include/gtest/gtest.h',
'gtest/include/gtest/gtest_pred_impl.h',
'gtest/include/gtest/gtest_prod.h',
+ 'gtest/src/gtest-test-part.cc',
'multiprocess_func_list.cc',
])
diff --git a/testing/gtest.vcproj b/testing/gtest.vcproj
index 62421c4..aa8dec9 100644
--- a/testing/gtest.vcproj
+++ b/testing/gtest.vcproj
@@ -120,72 +120,124 @@
<References>
</References>
<Files>
- <File
- RelativePath="gtest\include\gtest\internal\gtest-death-test-internal.h"
- >
- </File>
- <File
- RelativePath="gtest\src\gtest-death-test.cc"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\gtest-death-test.h"
- >
- </File>
- <File
- RelativePath="gtest\src\gtest-filepath.cc"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\internal\gtest-filepath.h"
- >
- </File>
- <File
- RelativePath="gtest\src\gtest-internal-inl.h"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\internal\gtest-internal.h"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\gtest-message.h"
- >
- </File>
- <File
- RelativePath="gtest\src\gtest-port.cc"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\internal\gtest-port.h"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\gtest-spi.h"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\internal\gtest-string.h"
- >
- </File>
- <File
- RelativePath="gtest\src\gtest.cc"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\gtest.h"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\gtest_pred_impl.h"
- >
- </File>
- <File
- RelativePath="gtest\include\gtest\gtest_prod.h"
- >
- </File>
- <File
- RelativePath="multiprocess_func_list.cc"
+ <Filter
+ Name="src"
+ >
+ <File
+ RelativePath=".\gtest\src\gtest-death-test.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\src\gtest-filepath.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\src\gtest-internal-inl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\src\gtest-port.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\src\gtest-test-part.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\src\gtest.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="include"
+ >
+ <File
+ RelativePath=".\gtest\include\gtest\gtest-death-test.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest-message.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest-param-test.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest-spi.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest-test-part.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest-typed-test.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest_pred_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\gtest_prod.h"
+ >
+ </File>
+ <Filter
+ Name="internal"
+ >
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-death-test-internal.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-filepath.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-internal.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-linked_ptr.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-param-util-generated.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-param-util.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-port.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-string.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gtest\include\gtest\internal\gtest-type-util.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <File
+ RelativePath=".\multiprocess_func_list.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\multiprocess_func_list.h"
+ >
+ </File>
+ <File
+ RelativePath=".\platform_test.h"
>
</File>
</Files>
diff --git a/testing/gtest.xcodeproj/project.pbxproj b/testing/gtest.xcodeproj/project.pbxproj
index 809d6c7..885ea76 100644
--- a/testing/gtest.xcodeproj/project.pbxproj
+++ b/testing/gtest.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 14A5C8D90F13F7F500AA6CC7 /* gtest-test-part.cc in Sources */ = {isa = PBXBuildFile; fileRef = 14A5C8D80F13F7F500AA6CC7 /* gtest-test-part.cc */; };
B593AFF90EB7D41B00B72887 /* multiprocess_func_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = B593AFF70EB7D41B00B72887 /* multiprocess_func_list.cc */; };
B5E5A6A00EE4BCCA007808DF /* platform_test_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5E5A69F0EE4BCCA007808DF /* platform_test_mac.mm */; };
E45A2BBC0E47A20200DB1196 /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45A2BB60E47A20200DB1196 /* gtest_main.cc */; };
@@ -17,6 +18,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 14A5C8D80F13F7F500AA6CC7 /* gtest-test-part.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-test-part.cc"; sourceTree = "<group>"; };
7B836C740E55C8CC00F6AD31 /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
7B836C750E55C8CC00F6AD31 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
7B836C760E55C8CC00F6AD31 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
@@ -59,6 +61,7 @@
08FB7795FE84155DC02AAC07 /* Source */ = {
isa = PBXGroup;
children = (
+ 14A5C8D80F13F7F500AA6CC7 /* gtest-test-part.cc */,
E45A2BB70E47A20200DB1196 /* gtest-death-test.cc */,
E45A2BB80E47A20200DB1196 /* gtest-filepath.cc */,
E45A2BB90E47A20200DB1196 /* gtest-internal-inl.h */,
@@ -143,6 +146,7 @@
E45A2BBC0E47A20200DB1196 /* gtest_main.cc in Sources */,
B593AFF90EB7D41B00B72887 /* multiprocess_func_list.cc in Sources */,
B5E5A6A00EE4BCCA007808DF /* platform_test_mac.mm in Sources */,
+ 14A5C8D90F13F7F500AA6CC7 /* gtest-test-part.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
generated by cgit v1.1 at 2024-12-27 12:07:24 +0000