3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-01-14 01:08:01 +08:00
Code Issues Projects Releases Wiki Activity

Switch googletest and googlemock to pull from the GitHub git repository

Browse Source 
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/1404033002 .
This commit is contained in:
Mark Mentovai 2015-11-11 11:13:37 -05:00
parent 97b0f86d0c
commit 6e89d45d7d
9 changed files with 159 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,7 +10,6 @@
.gdbinit
/Makefile
/out
/third_party/gmock/gmock
/third_party/gtest/gtest
/third_party/gyp/gyp
/third_party/mini_chromium/mini_chromium

7
DEPS
View File

@ -17,12 +17,9 @@ vars = {
}
deps = {
'crashpad/third_party/gmock/gmock':
Var('chromium_git') + '/external/gmock@' +
'29763965ab52f24565299976b936d1265cb6a271', # svn r501
'crashpad/third_party/gtest/gtest':
Var('chromium_git') + '/external/gtest@' +
'8245545b6dc9c4703e6496d1efd19e975ad2b038', # svn r700
Var('chromium_git') + '/external/github.com/google/googletest@' +
'71a26ac68b28c61686b8941730a6b2577912e239',
'crashpad/third_party/gyp/gyp':
Var('chromium_git') + '/external/gyp@' +
'01528c7244837168a1c80f06ff60fa5a9793c824',

4
client/client_test.gyp
View File

@ -23,9 +23,9 @@
'dependencies': [
'client.gyp:crashpad_client',
'../test/test.gyp:crashpad_test',
'../third_party/gmock/gmock.gyp:gmock',
'../third_party/gtest/gmock.gyp:gmock',
'../third_party/gtest/gmock.gyp:gmock_main',
'../third_party/gtest/gtest.gyp:gtest',
'../third_party/gtest/gtest.gyp:gtest_main',
'../third_party/mini_chromium/mini_chromium.gyp:base',
'../util/util.gyp:crashpad_util',
],

4
test/test_test.gyp
View File

@ -24,8 +24,8 @@
'crashpad_test_test_multiprocess_exec_test_child',
'test.gyp:crashpad_test',
'../compat/compat.gyp:crashpad_compat',
'../third_party/gmock/gmock.gyp:gmock',
'../third_party/gmock/gmock.gyp:gmock_main',
'../third_party/gtest/gmock.gyp:gmock',
'../third_party/gtest/gmock.gyp:gmock_main',
'../third_party/gtest/gtest.gyp:gtest',
'../third_party/mini_chromium/mini_chromium.gyp:base',
'../util/util.gyp:crashpad_util',

14
third_party/gmock/README.crashpad vendored
View File

@ -1,14 +0,0 @@
Name: Google C++ Mocking Framework (googlemock)
Short Name: gmock
URL: https://github.com/google/googletest/tree/master/googlemock/
Revision: See DEPS
License: BSD 3-clause
License File: gmock/LICENSE
Security Critical: no
Description:
Google C++ Mocking Framework (or Google Mock for short) is a library for
writing and using C++ mock classes.
Local Modifications:
None

9
third_party/gtest/README.crashpad vendored
View File

@ -1,14 +1,15 @@
Name: Google C++ Testing Framework (googletest)
Name: Google Test (googletest)
Short Name: gtest
URL: https://github.com/google/googletest/
Revision: See DEPS
License: BSD 3-clause
License File: gtest/LICENSE
License File: gtest/googletest/LICENSE
Security Critical: no
Description:
Google C++ Testing Framework (or Google Test for short) is Google’s framework
for writing C++ tests on a variety of platforms.
Google Test (Google C++ Testing Framework) is Google’s framework for writing C++
tests on a variety of platforms. It includes Google Mock, an extension for
writing and using C++ mock classes.
Local Modifications:
None

139
third_party/gmock/gmock.gyp → third_party/gtest/gmock.gyp vendored
View File

@ -18,43 +18,7 @@
],
'conditions': [
['crashpad_in_chromium==0', {
'targets': [
{
'target_name': 'gmock',
'type': 'static_library',
'dependencies': [
'../gtest/gtest.gyp:gtest',
],
'include_dirs': [
'gmock',
'gmock/include',
],
'sources': [
'gmock/include/gmock/gmock-actions.h',
'gmock/include/gmock/gmock-cardinalities.h',
'gmock/include/gmock/gmock-generated-actions.h',
'gmock/include/gmock/gmock-generated-function-mockers.h',
'gmock/include/gmock/gmock-generated-matchers.h',
'gmock/include/gmock/gmock-generated-nice-strict.h',
'gmock/include/gmock/gmock-matchers.h',
'gmock/include/gmock/gmock-more-actions.h',
'gmock/include/gmock/gmock-more-matchers.h',
'gmock/include/gmock/gmock-spec-builders.h',
'gmock/include/gmock/gmock.h',
'gmock/include/gmock/internal/gmock-generated-internal-utils.h',
'gmock/include/gmock/internal/gmock-internal-utils.h',
'gmock/include/gmock/internal/gmock-port.h',
'gmock/src/gmock-all.cc',
'gmock/src/gmock-cardinalities.cc',
'gmock/src/gmock-internal-utils.cc',
'gmock/src/gmock-matchers.cc',
'gmock/src/gmock-spec-builders.cc',
'gmock/src/gmock.cc',
],
'sources!': [
'gmock/src/gmock-all.cc',
],
'target_defaults': {
# gmock relies heavily on objects with static storage duration.
'xcode_settings': {
'WARNING_CFLAGS!': [
@ -64,10 +28,51 @@
'cflags!': [
'-Wexit-time-destructors',
],
},
'targets': [
{
'target_name': 'gmock',
'type': 'static_library',
'dependencies': [
'gtest.gyp:gtest',
],
'include_dirs': [
'gtest/googlemock',
'gtest/googlemock/include',
],
'sources': [
'gtest/googlemock/include/gmock/gmock-actions.h',
'gtest/googlemock/include/gmock/gmock-cardinalities.h',
'gtest/googlemock/include/gmock/gmock-generated-actions.h',
'gtest/googlemock/include/gmock/gmock-generated-function-mockers.h',
'gtest/googlemock/include/gmock/gmock-generated-matchers.h',
'gtest/googlemock/include/gmock/gmock-generated-nice-strict.h',
'gtest/googlemock/include/gmock/gmock-matchers.h',
'gtest/googlemock/include/gmock/gmock-more-actions.h',
'gtest/googlemock/include/gmock/gmock-more-matchers.h',
'gtest/googlemock/include/gmock/gmock-spec-builders.h',
'gtest/googlemock/include/gmock/gmock.h',
'gtest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h',
'gtest/googlemock/include/gmock/internal/custom/gmock-matchers.h',
'gtest/googlemock/include/gmock/internal/custom/gmock-port.h',
'gtest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h',
'gtest/googlemock/include/gmock/internal/gmock-internal-utils.h',
'gtest/googlemock/include/gmock/internal/gmock-port.h',
'gtest/googlemock/src/gmock-all.cc',
'gtest/googlemock/src/gmock-cardinalities.cc',
'gtest/googlemock/src/gmock-internal-utils.cc',
'gtest/googlemock/src/gmock-matchers.cc',
'gtest/googlemock/src/gmock-spec-builders.cc',
'gtest/googlemock/src/gmock.cc',
],
'sources!': [
'gtest/googlemock/src/gmock-all.cc',
],
'direct_dependent_settings': {
'include_dirs': [
'gmock/include',
'gtest/googlemock/include',
],
'conditions': [
['clang!=0', {
@ -98,7 +103,7 @@
],
},
'export_dependent_settings': [
'../gtest/gtest.gyp:gtest',
'gtest.gyp:gtest',
],
},
{
@ -106,10 +111,10 @@
'type': 'static_library',
'dependencies': [
'gmock',
'../gtest/gtest.gyp:gtest',
'gtest.gyp:gtest',
],
'sources': [
'gmock/src/gmock_main.cc',
'gtest/googlemock/src/gmock_main.cc',
],
},
{
@ -117,17 +122,17 @@
'type': 'none',
'dependencies': [
'gmock',
'../gtest/gtest.gyp:gtest',
'gtest.gyp:gtest',
],
'direct_dependent_settings': {
'type': 'executable',
'include_dirs': [
'gmock',
'gtest/googlemock',
],
},
'export_dependent_settings': [
'gmock',
'../gtest/gtest.gyp:gtest',
'gtest.gyp:gtest',
],
},
{
@ -136,19 +141,23 @@
'gmock_test_executable',
'gmock_main',
],
'include_dirs': [
'gtest/googletest',
],
'sources': [
'gmock/test/gmock-actions_test.cc',
'gmock/test/gmock-cardinalities_test.cc',
'gmock/test/gmock-generated-actions_test.cc',
'gmock/test/gmock-generated-function-mockers_test.cc',
'gmock/test/gmock-generated-internal-utils_test.cc',
'gmock/test/gmock-generated-matchers_test.cc',
'gmock/test/gmock-internal-utils_test.cc',
'gmock/test/gmock-matchers_test.cc',
'gmock/test/gmock-more-actions_test.cc',
'gmock/test/gmock-nice-strict_test.cc',
'gmock/test/gmock-port_test.cc',
'gmock/test/gmock_test.cc',
'gtest/googlemock/test/gmock-actions_test.cc',
'gtest/googlemock/test/gmock-cardinalities_test.cc',
'gtest/googlemock/test/gmock-generated-actions_test.cc',
'gtest/googlemock/test/gmock-generated-function-mockers_test.cc',
'gtest/googlemock/test/gmock-generated-internal-utils_test.cc',
'gtest/googlemock/test/gmock-generated-matchers_test.cc',
'gtest/googlemock/test/gmock-internal-utils_test.cc',
'gtest/googlemock/test/gmock-matchers_test.cc',
'gtest/googlemock/test/gmock-more-actions_test.cc',
'gtest/googlemock/test/gmock-nice-strict_test.cc',
'gtest/googlemock/test/gmock-port_test.cc',
'gtest/googlemock/test/gmock-spec-builders_test.cc',
'gtest/googlemock/test/gmock_test.cc',
],
},
{
@ -158,18 +167,9 @@
'gmock_main',
],
'sources': [
'gmock/test/gmock_link_test.cc',
'gmock/test/gmock_link_test.h',
'gmock/test/gmock_link2_test.cc',
],
},
{
'target_name': 'gmock_spec_builders_test',
'dependencies': [
'gmock_test_executable',
],
'sources': [
'gmock/test/gmock-spec-builders_test.cc',
'gtest/googlemock/test/gmock_link_test.cc',
'gtest/googlemock/test/gmock_link_test.h',
'gtest/googlemock/test/gmock_link2_test.cc',
],
},
{
@ -178,7 +178,7 @@
'gmock_test_executable',
],
'sources': [
'gmock/test/gmock_stress_test.cc',
'gtest/googlemock/test/gmock_stress_test.cc',
],
},
{
@ -187,7 +187,6 @@
'dependencies': [
'gmock_all_test',
'gmock_link_test',
'gmock_spec_builders_test',
'gmock_stress_test',
],
},

153
third_party/gtest/gtest.gyp vendored
View File

@ -18,47 +18,7 @@
],
'conditions': [
['crashpad_in_chromium==0', {
'targets': [
{
'target_name': 'gtest',
'type': 'static_library',
'include_dirs': [
'gtest',
'gtest/include',
],
'sources': [
'gtest/include/gtest/gtest-death-test.h',
'gtest/include/gtest/gtest-message.h',
'gtest/include/gtest/gtest-param-test.h',
'gtest/include/gtest/gtest-printers.h',
'gtest/include/gtest/gtest-spi.h',
'gtest/include/gtest/gtest-test-part.h',
'gtest/include/gtest/gtest-typed-test.h',
'gtest/include/gtest/gtest.h',
'gtest/include/gtest/gtest_pred_impl.h',
'gtest/include/gtest/gtest_prod.h',
'gtest/include/gtest/internal/gtest-death-test-internal.h',
'gtest/include/gtest/internal/gtest-filepath.h',
'gtest/include/gtest/internal/gtest-internal.h',
'gtest/include/gtest/internal/gtest-linked_ptr.h',
'gtest/include/gtest/internal/gtest-param-util-generated.h',
'gtest/include/gtest/internal/gtest-param-util.h',
'gtest/include/gtest/internal/gtest-port.h',
'gtest/include/gtest/internal/gtest-string.h',
'gtest/include/gtest/internal/gtest-tuple.h',
'gtest/include/gtest/internal/gtest-type-util.h',
'gtest/src/gtest.cc',
'gtest/src/gtest-death-test.cc',
'gtest/src/gtest-filepath.cc',
'gtest/src/gtest-port.cc',
'gtest/src/gtest-printers.cc',
'gtest/src/gtest-test-part.cc',
'gtest/src/gtest-typed-test.cc',
],
'sources!': [
'gtest/src/gtest-all.cc',
],
'target_defaults': {
# gtest relies heavily on objects with static storage duration.
'xcode_settings': {
'WARNING_CFLAGS!': [
@ -68,10 +28,58 @@
'cflags!': [
'-Wexit-time-destructors',
],
},
'targets': [
{
'target_name': 'gtest',
'type': 'static_library',
'include_dirs': [
'gtest/googletest',
'gtest/googletest/include',
],
'sources': [
'gtest/googletest/include/gtest/gtest-death-test.h',
'gtest/googletest/include/gtest/gtest-message.h',
'gtest/googletest/include/gtest/gtest-param-test.h',
'gtest/googletest/include/gtest/gtest-printers.h',
'gtest/googletest/include/gtest/gtest-spi.h',
'gtest/googletest/include/gtest/gtest-test-part.h',
'gtest/googletest/include/gtest/gtest-typed-test.h',
'gtest/googletest/include/gtest/gtest.h',
'gtest/googletest/include/gtest/gtest_pred_impl.h',
'gtest/googletest/include/gtest/gtest_prod.h',
'gtest/googletest/include/gtest/internal/custom/gtest-port.h',
'gtest/googletest/include/gtest/internal/custom/gtest-printers.h',
'gtest/googletest/include/gtest/internal/custom/gtest.h',
'gtest/googletest/include/gtest/internal/gtest-death-test-internal.h',
'gtest/googletest/include/gtest/internal/gtest-filepath.h',
'gtest/googletest/include/gtest/internal/gtest-internal.h',
'gtest/googletest/include/gtest/internal/gtest-linked_ptr.h',
'gtest/googletest/include/gtest/internal/gtest-param-util-generated.h',
'gtest/googletest/include/gtest/internal/gtest-param-util.h',
'gtest/googletest/include/gtest/internal/gtest-port-arch.h',
'gtest/googletest/include/gtest/internal/gtest-port.h',
'gtest/googletest/include/gtest/internal/gtest-string.h',
'gtest/googletest/include/gtest/internal/gtest-tuple.h',
'gtest/googletest/include/gtest/internal/gtest-type-util.h',
'gtest/googletest/src/gtest-all.cc',
'gtest/googletest/src/gtest-death-test.cc',
'gtest/googletest/src/gtest-filepath.cc',
'gtest/googletest/src/gtest-internal-inl.h',
'gtest/googletest/src/gtest-port.cc',
'gtest/googletest/src/gtest-printers.cc',
'gtest/googletest/src/gtest-test-part.cc',
'gtest/googletest/src/gtest-typed-test.cc',
'gtest/googletest/src/gtest.cc',
],
'sources!': [
'gtest/googletest/src/gtest-all.cc',
],
'direct_dependent_settings': {
'include_dirs': [
'gtest/include',
'gtest/googletest/include',
],
},
},
@ -82,7 +90,7 @@
'gtest',
],
'sources': [
'gtest/src/gtest_main.cc',
'gtest/googletest/src/gtest_main.cc',
],
},
{
@ -94,7 +102,7 @@
'direct_dependent_settings': {
'type': 'executable',
'include_dirs': [
'gtest',
'gtest/googletest',
],
},
'export_dependent_settings': [
@ -108,23 +116,23 @@
'gtest_main',
],
'sources': [
'gtest/test/gtest-death-test_test.cc',
'gtest/test/gtest-filepath_test.cc',
'gtest/test/gtest-linked_ptr_test.cc',
'gtest/test/gtest-message_test.cc',
'gtest/test/gtest-options_test.cc',
'gtest/test/gtest-port_test.cc',
'gtest/test/gtest-printers_test.cc',
'gtest/test/gtest-test-part_test.cc',
'gtest/test/gtest-typed-test_test.cc',
'gtest/test/gtest-typed-test_test.h',
'gtest/test/gtest-typed-test2_test.cc',
'gtest/test/gtest_main_unittest.cc',
'gtest/test/gtest_pred_impl_unittest.cc',
'gtest/test/gtest_prod_test.cc',
'gtest/test/gtest_unittest.cc',
'gtest/test/production.cc',
'gtest/test/production.h',
'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/gtest-typed-test2_test.cc',
'gtest/googletest/test/gtest-typed-test_test.cc',
'gtest/googletest/test/gtest-typed-test_test.h',
'gtest/googletest/test/gtest_main_unittest.cc',
'gtest/googletest/test/gtest_pred_impl_unittest.cc',
'gtest/googletest/test/gtest_prod_test.cc',
'gtest/googletest/test/gtest_unittest.cc',
'gtest/googletest/test/production.cc',
'gtest/googletest/test/production.h',
],
},
{
@ -133,7 +141,7 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest_environment_test.cc',
'gtest/googletest/test/gtest_environment_test.cc',
],
},
{
@ -142,7 +150,7 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest-listener_test.cc',
'gtest/googletest/test/gtest-listener_test.cc',
],
},
{
@ -151,7 +159,7 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest_no_test_unittest.cc',
'gtest/googletest/test/gtest_no_test_unittest.cc',
],
},
{
@ -160,9 +168,9 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest-param-test_test.cc',
'gtest/test/gtest-param-test_test.h',
'gtest/test/gtest-param-test2_test.cc',
'gtest/googletest/test/gtest-param-test2_test.cc',
'gtest/googletest/test/gtest-param-test_test.cc',
'gtest/googletest/test/gtest-param-test_test.h',
],
},
{
@ -171,7 +179,7 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest_premature_exit_test.cc',
'gtest/googletest/test/gtest_premature_exit_test.cc',
],
},
{
@ -180,7 +188,7 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest_repeat_test.cc',
'gtest/googletest/test/gtest_repeat_test.cc',
],
},
{
@ -190,7 +198,7 @@
'gtest_main',
],
'sources': [
'gtest/test/gtest_sole_header_test.cc',
'gtest/googletest/test/gtest_sole_header_test.cc',
],
},
{
@ -199,7 +207,7 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest_stress_test.cc',
'gtest/googletest/test/gtest_stress_test.cc',
],
},
{
@ -208,7 +216,7 @@
'gtest_test_executable',
],
'sources': [
'gtest/test/gtest-unittest-api_test.cc',
'gtest/googletest/test/gtest-unittest-api_test.cc',
],
},
{
@ -217,6 +225,7 @@
'dependencies': [
'gtest_all_test',
'gtest_environment_test',
'gtest_listener_test',
'gtest_no_test',
'gtest_param_test',
'gtest_premature_exit_test',

4
util/util_test.gyp
View File

@ -25,8 +25,8 @@
'../client/client.gyp:crashpad_client',
'../compat/compat.gyp:crashpad_compat',
'../test/test.gyp:crashpad_test',
'../third_party/gmock/gmock.gyp:gmock',
'../third_party/gmock/gmock.gyp:gmock_main',
'../third_party/gtest/gmock.gyp:gmock',
'../third_party/gtest/gmock.gyp:gmock_main',
'../third_party/gtest/gtest.gyp:gtest',
'../third_party/mini_chromium/mini_chromium.gyp:base',
],