mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-27 15:32:10 +08:00
f5564e6292
gtest started depending on zircon and launchpad directly for death tests, so tweak the build files. Logs for upstreams below: mini_chromium$ git log --oneline --no-merges --no-decorate 40cb6722bbc6bd6fb5fccecd80362313440a0537..53a3ff4cf81adb25fdf764e8547a8515fc8f70c2 53a3ff4 fuchsia: Add fdio to system includes 23b3647 fuchsia: Update sysroot.gni for sysroot location moving in SDK gtest$ git log --oneline --no-merges --no-decorate d175c8bf823e709d570772b038757fadf63bc632..145d05750b15324899473340c8dd5af50d125d33 49ecebd Downgrade to C++98. ec2c911 Downgrade to C++98 code. f91bf75 Remove unused variable in Fuchsia. 54e331b Add support for versioned standard libraries. fc66ae4 Update generated code. b8fa4d2 Add unit test for CanonicalizeForStdLibVersioning. 18abd8f Use NULL instead of nullptr, for pre-C++11 builds. ec5ad0f Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively. 960149f Remove magic number 242f0f6 Style fix 8497540 Fix comments 13af91f Fix more stuff and get tests to pass 96c3c42 Get all the things to work. a9653c4 Fix gmock not building when -fno-rtti b6cb5c3 Fix stuff d4b5281 Add Fuchsia support for death test. 95ec42d Add no-exception and no-rtti to build matrix b539167 merging, bb7a018 reverting, test 7b4ee66 reverting just to test 62a7c14 testing 2d3024f Fix friend declaration to use GTEST_API_ decl spec. b2f97ab Revert useless use of GTEST_API_ on WithoutMatchers decl. 1c79ad7 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC? d5725da Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. f6551f2 Don't use generalized initializer list; is C++11 extension. f437f8c Clone of unsubmitted cr/176529515. Introduce parameterless expectations. f312435 more typos a0fd742 msvc b00e281 more typos 881ee30 typo 10e8ec2 move only types docs 4d554c3 typo b4cbf53 typo 78d7381 http://cl/193386206 c56ba73 merge, explicit, ( should be it) 4707c0f 193353312 80d6e26 cl/193060888 5dccf6b http://cl/193060888 dff32af http://cl/193060888 3f88bb1 test-meerging ec425d7 typo e4ab316 more msvc 1944bc0 typo e9eff48 msvc warnings bd2a1ae merging gmock generated matchers 9fba103 merging, testing, this should be it 1c6e68c merging 26c10dc merging d84eb86 more pizza f45728a more OSX pizzas b74a1af osx pizzas f9bd618 merging gmock actions test 0bfa823 merging, gmock actions test 2dc576e merging f7330f9 more fixing osx libstd++ bugs 6538049 fixing dc4f563 merging, fix OSX issue 092ca91 merging a79851f merging fa658e0 merging c67f51b msvc 9b5940e revert this one b2d81b4 merge, ... gmock-matchers test e77deb2 small cleanup 1324e2d Remove multiple inheritance from "unintesting call" mock classes. 373481c ...merging 8654c1c merging ab84d14 Upstream cl/192179348 c13ab60 merging 5cd213e ..and this should be it 6a7573a more 039d9b5 pizza work, cont f15fd96 osx pizzas, cont b15be9a fixing osx pizza 6f9db26 merging 9bc82ce merging 25d8176 merging e1071eb RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 8fbb419 Include gcc on mac into PR matrix ca54b67 Revert "gmock actions 2" 64d24b8 ... and this c1d4c34 this should be it f587100 yet more 05b5a53 formatting 2de24fb tuning 055f321 tuning 57d6e82 more 44da2b9 cont e93a0ec msvc c4684b4 more msvc 431bfdc msvc 14 8bc7c63 testing msvc again c4e3d77 More msvc 14 6525044 And also silence for MSVS14 35a709a preproc syntax ( I can never remember it) 61e8a0b syntax 03be5df cont. e0b3c26 continued 51f8ad4 Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. dbd206e more mcvs fixing 701e1e5 linkage, fixing MSVC 2d4d4ef fixing MSVC 5fe8de5 more warnings cb13dc7 more warnings d9f3611 more MSVC warnings c75b76e warnings 04e3188 cont - 2 32ac949 cont 1831ac9 more warnings eb3e4aa deal with MSVC warn, cont 1 50c0bcd Cont. deal with MCVS warnings b5c87fb Deal with MCVS warnings 88fc7d7 merging gmock-actions 2 fe402c2 Merging gMock, 2 7e5f90d formatting 9286361 And more MCVS warnings e0f4cf0 fixing MCVS warn 7045138 Have to wait for this one 66eaf9f Have to wait for this one af93d59 Merging matchers test 0cd6a4f Merging matchers test d81b6a0 bad cut/paste a608d4a More on MSVC warning C4503, decorated name length exceeded 6f4e939 More on MSVC warning C4503, decorated name length exceeded 5b3d277 Address MSVC warning C4503, decorated name length exceeded, name was truncated aa14cc4 Fixing build break on MSVC e55089e merging gmock matchers 1 a0c27bd fix build break on locale windows 1776ed8 Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl d52aaee Upstreaming, cl 191344765 a2dd136 merging port, cont. 191443078 aa349ac merging, cont - 2 2cedd5b merging gtest-port.h , 191439094 04d1e56 merging, just comments format 5beb452 testing, merge df5a48d Testing, gtest-port.h merge 87a4cdd merging gtest-port.h, again - 1 7888184 Include OSX builds back into PR builds b2373c6 Revert "merging gtest-port 1 of N" 54bb165 Revert "merging gtest-port, 2" d04bf07 typo 8e0364a merging gtest-port, 2 11855d8 provide alternative for DebugBreak() aea6fc3 merging gtest-port 1 of N a75a5c9 merges 1 3df7cbe merges, gtest 6aae206 merging gmock-matchers.h 3 2318705 merging gmock-matchers.h 2 8ea10d3 Upstreaming FloatingEq2Matcher, b907c26 Merging gmock-matchers.h -2 466a49a gmock-matchers merging -2 b7c5683 merging, gmock -1 4e89c76 reverting gtest_list_tests_unittest.py eaaa422 Update appveyor.yml da71e8c more merges 0f65679 more merges 691e38e More merges a3c2e10 cl 189032107, again 080fcbe cl 189032107 a178cc7 merge, again, IsRecursiveContainer 262aaf2 erging, cont 2814b4b merging, merging a719320 fixing, was removing too much af463c4 More merges, removing old dead code 7b70413 Allow macros inside of parametrized test names. cf9d634 merges-port(1) e891900 Merging, XML tests 89d6f70 merges-8 995a9df merges-7 086825d merges-6 8385928 merges-3 dbf63e3 merges-2 0d5e01a Merges-1 7a2050d Use a full message in the JSON output for failures 3431b69 Add options to parallelize builds. 6baf17e Support JSON output format in addition to XML 2eb31c1 Add documentation for VariantWith. 2bd1750 gmock merging -2 190e2cd Add matcher for std::variant. 84ec2e0 Switch default death test style back to "fast". 20074be Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX 4dbb437 merging unittests - 5 567b40e Try to handle unsigned wchar_t (arm) a bit better 004f6a0 merging unitests - check 4 29e9ca8 merging unitests, check 3299a23 merging unittests - 2 b7e0294 merging unitests 11e1dd2 Removed trailing comma in enum 0656830 TEST() arguments are invalid in an example df65632 merges 8a61587 Fix unused function warning on Mac OS. a3e322b cleanup, merges 09581b3 cleanup/merges 0697241 merging, cleaning up ab186a8 merges 30d276d cxxx11 3b1fe3e clang warnings d7c966c clang warnings 2a23ca0 https://travis-ci.org/google/googletest/jobs/340995238 a66d209 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' e76f4ee clang warning https://travis-ci.org/google/googletest/jobs/340978022 9e07281 merges 225e674 moving JoinAsTuple to internal b3a1759 Fix std::iscntrl use in gtest-printers.cc d84f58a Merging, coniniue 575c081 merging 49fc378 merges ec7faa9 merges c851050 Fixed typos 092d088 Add ability to throw from ASSERT a3c73ed Include MSVC14 on PRs as well e6ec8bc Merges and also adding new bazel build mode e55fded Code merges 2a46830 Ability to optionally depend on Abseil plus upstream of 183716547 6c0c389 Adding tests to googlemock bazel fbb48a7 Code merges efd49c2 Update Documentation.md b8ac390 Fix test build issue with GCC7.2. 3498a1a Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. f915530 Pass -EHs-c- to disable exceptions with MSVC. b3a2048 Update README.md 7cced89 Remove Visual Studio 10,11,12 from build matrix b9651c0 placating gcc and its overzeauls size comparison warnings e29805a upstream cl 182543808 06c3cce revert, lets get this compiled 80defce Many code merge/upstream changes 6723b6c Merging, upstream http://cl/182836545 bbb17ad more code merge f1c87ad merges, cl/155419551 and other 9bc8666 more merging a0435a5 merging 8d707df code merge b1623e9 Adding python tests to Bazel build file. 8e86221 Use fully qualified in examples 354fc8d Document ScopedTrace utility ba99a04 Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++. 9c82e77 Expose ScopedTrace utility in public interface 08b323f Reverting some changes, need to make the merge compile 9195571 Reverting some changes, need to make the merge compile 6d04de7 Reverting some changes, need to make the merge compile b9e2978 Reverting some changes, need to make the merge compile 304be8f Test files for corresponding changes 6befe42 Test files for corresponding changes f45c22c Test files for corresponding changes 5f4ce9d Test files for corresponding changes d629744 More code merges da1f7fe Code merging 33d73d4 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne 569d713 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne 93b7798 continue upstream/merge, etc ed8d02c Update .travis.yml 73d1251 Update .travis.yml cfd29e0 Update .travis.yml 29f94e0 Update .travis.yml 2982dc1 Trying to fix travis 6914ae2 Upstream cl 103120214 1d757db More merge, cleanup 481fe94 More merge, cleanup 6a26e47 Code merge, upstreaming accumulated changes, cleanup 62dbaa2 revert d630a8b code merges, cleanup f33902b revert googletest/test/gtest-param-test_test.cc 6eccdb7 Update .travis.yml d237297 code merge, cleanups 2ad5661 Upstream of cl 129104714 5eecadf Revert one file 9fce984 wip, cleanups/merge 258fd6e cleanup, merge cbd15d4 [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc 91ba05c Small cleanups, merge 67d6e46 Use correct name for build event types. 67476c1 Revert one file for now adfdc65 Fixed test for pull request. d3acb4b Fixed output and test for 'enabled_on_pr' 19b5774 code cleanup in preparation for merges, cl 180857299 9cee677 Optimize build matrix (#1) 1c09831 upstreaming cl 124976692 1acf8c7 Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl. b3d9be5 Pass the -Wmissing-declarations warning. e7734fb OSS Sync, cl 163329677 90244a6 Fix testing::Combine on MSVC 2017. bcd3552 Avoid warning C4619 in MSVC 2017. ec2b0c3 Build both googletest and googlemock. 75b85d5 Create a autotools-based build for Travis. 7990f56 Re-enable MSVC++ C4389 warning in CmdHelperEq() e17907d Update internal_utils.cmake a7fceb4 Update gtest-param-test.h.pump 8a48f0e Update gtest-param-test.h.pump 23a014a Refactor docs about contributions to CONTRIBUTING.md. 74a5306 remove extra line 3ea0631 remove implicit casts c82cd5e Also add documentation around becoming a contributor. 1184117 Wrong LICENSE file, sorry. Corrected. [skip ci] bc3320b Implement bazel-based builds in Travis. e22d344 Add Apache-2.0 LICENSE file. cf3adad Add licenses() directive for googlemock/tests. 57bb0bb Remove C4996 warning in VS2017 3464f76 Improved description of VS std::tuple support 8d9d6bb Improved description of VS std::tuple support 4aa05bd Only switch to g++-4.9 on Linux. aea8580 Run autoconf from top-level directory. 0663ce9 Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both. f46bd00 make includes system a7269e2 replaced back accidently removed static_cast with consistent ImplicitCast_ 82447f2 Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output 1ae4096 fix for VS2017 deprecation of ::tr1::tuple change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces aa0b545 remove GTEST_HAS_PARAM_TESTS 4d26df7 Speed up printing of characters which need hex escaping 99d0ef3 Also can build when included in source. 9538687 Remove trailing whitespaces in BUILD.bazel c113a71 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne ca6a70c Pass MSVC's C4826 warning. Bug: crashpad:196 Change-Id: I60be5750667d1901e0ad47c3558de1338b083536 Reviewed-on: https://chromium-review.googlesource.com/1069562 Reviewed-by: Joshua Peraza <jperaza@chromium.org> Commit-Queue: Scott Graham <scottmg@chromium.org>