3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

roll googletest to b18d39

Browse Source 
* 71d4fc is the change fixing death tests on Fuchsia where the exception was still caught by the system exception handler
* we need up to b18d39 to make Windows happy

Change-Id: Ic938caabe3dde93ebda520b389b166d78c4460a6
Reviewed-on: https://chromium-review.googlesource.com/c/1350931
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Francois Rousseau <frousseau@google.com>
This commit is contained in:
Francois Rousseau 2018-11-26 15:13:08 -08:00 committed by Commit Bot
parent 083fd52cc3
commit 3ca0713430
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -24,7 +24,7 @@ deps = {
'6fe4a3251488f7af86d64fc25cf442e817cf6133',
'crashpad/third_party/gtest/gtest':
Var('chromium_git') + '/external/github.com/google/googletest@' +
'c091b0469ab4c04ee9411ef770f32360945f4c53',
'b18d39bd2ea2d2b508228a9a1d8ae9f7fba32f78',
'crashpad/third_party/gyp/gyp':
Var('chromium_git') + '/external/gyp@' +
'5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f',

28
third_party/gtest/BUILD.gn vendored
View File

@ -95,6 +95,11 @@ if (crashpad_is_in_chromium) {
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
]
configs += [ ":gtest_private_config" ]
if (crashpad_is_fuchsia) {
deps = [
"../fuchsia:zx",
]
}
}
static_library("gtest_main") {
@ -112,14 +117,13 @@ if (crashpad_is_in_chromium) {
test("gtest_all_test") {
sources = [
"gtest/googletest/test/gtest-death-test_test.cc",
"gtest/googletest/test/gtest-filepath_test.cc",
"gtest/googletest/test/gtest-linked_ptr_test.cc",
"gtest/googletest/test/gtest-message_test.cc",
"gtest/googletest/test/gtest-options_test.cc",
"gtest/googletest/test/gtest-port_test.cc",
"gtest/googletest/test/gtest-printers_test.cc",
"gtest/googletest/test/gtest-test-part_test.cc",
"gtest/googletest/test/googletest-death-test-test.cc",
"gtest/googletest/test/googletest-filepath-test.cc",
"gtest/googletest/test/googletest-message-test.cc",
"gtest/googletest/test/googletest-options-test.cc",
"gtest/googletest/test/googletest-port-test.cc",
"gtest/googletest/test/googletest-printers-test.cc",
"gtest/googletest/test/googletest-test-part-test.cc",
"gtest/googletest/test/gtest-typed-test2_test.cc",
"gtest/googletest/test/gtest-typed-test_test.cc",
"gtest/googletest/test/gtest-typed-test_test.h",
@ -156,7 +160,7 @@ if (crashpad_is_in_chromium) {
test("gtest_listener_test") {
sources = [
"gtest/googletest/test/gtest-listener_test.cc",
"gtest/googletest/test/googletest-listener-test.cc",
]
deps = [
":gtest",
@ -174,9 +178,9 @@ if (crashpad_is_in_chromium) {
test("gtest_param_test") {
sources = [
"gtest/googletest/test/gtest-param-test2_test.cc",
"gtest/googletest/test/gtest-param-test_test.cc",
"gtest/googletest/test/gtest-param-test_test.h",
"gtest/googletest/test/googletest-param-test-test.cc",
"gtest/googletest/test/googletest-param-test-test.h",
"gtest/googletest/test/googletest-param-test2-test.cc",
]
configs -= [
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",