summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2589 from ↵refs/pull/2633/head1278977C598F83A02A525FEA38941265Matt Calabrese2019-12-131-9/+3
|\ | | | | | | | | | | kuzkry:remove-workaround_g++-no-space-after-first-macro-argument PiperOrigin-RevId: 285255373
| * remove g++ 2.95.0 workaround: no space after first comma in macrosrefs/pull/2589/headKrystian Kuzniarek2019-11-221-9/+3
| |
* | Export Test - Do Not MergeAbseil Team2019-12-131-1/+2
| | | | | | | | | | | | Add GTEST_API_ to correct a build failure under MSCV. PiperOrigin-RevId: 285208464
* | Export Test - Do Not MergeAbseil Team2019-12-133-175/+40
| | | | | | | | | | | | | | | | Use C++11 variadic templates for ActionHelper in gmock-generated-actions.h. Make ActionHelper use variadic templates to generate Perform static member function specializations instead of using pump.py syntax. PiperOrigin-RevId: 284988441
* | Export Test - Do Not MergeAbseil Team2019-12-135-4/+96
| | | | | | | | | | | | | | | | | | | | | | Detect when C++ parametric tests (TEST_P) are not instantiated. When an un-instantiated TEST_P is found, a new test will be inserted that will emit a warning message. This can be made to error with minor code edits. In the future, that is intended to be the default. PiperOrigin-RevId: 284901666
* | Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355Matt Calabrese2019-12-131-8/+0
|\ \ | | | | | | | | | PiperOrigin-RevId: 284234675
| * | remove MSVC workaround: warning 4355refs/pull/2595/headKrystian Kuzniarek2019-11-221-8/+0
| |/
* | Merge pull request #2592 from kuzkry:remove-workaround_msvc-error-C2665Matt Calabrese2019-12-131-9/+0
|\ \ | | | | | | | | | PiperOrigin-RevId: 284207090
| * | remove MSVC workaround: error C2665refs/pull/2592/headKrystian Kuzniarek2019-11-221-9/+0
| |/
* | Export Test - Do Not Mergemisterg2019-12-131-0/+2
| | | | | | | | | | | | Require all appveyor googletest windows builds to work on Pull Requests to increase CI coverage PiperOrigin-RevId: 284206759
* | Merge pull request #2609 from kuzkry:revert-2596Mark Barolak2019-12-062-11/+13
|\ \ | | | | | | | | | PiperOrigin-RevId: 284041013
| * | Revert "remove MSVC workaround: wmain link error in the static library"refs/pull/2609/headKrystian Kuzniarek2019-11-271-2/+9
| | | | | | | | | | | | This reverts commit 298a40f023e6813d2bf73847c3a38ceaf5e46320.
| * | Revert "unify googletest and googlemock main functions"Krystian Kuzniarek2019-11-272-9/+4
| | | | | | | | | | | | This reverts commit a909becdc599c46bcb57346b6123cb57cd07d15d.
* | | Googletest exportAbseil Team2019-12-066-31/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change googletest to notice failures during SetUpTestSuite() and TearDownTestSuite(). Previously, errors that occurred during those functions were logged but otherwise ignored. After this change, such failures will cause the test to fail and a brief summary will be printed at the bottom of the test log. See https://github.com/google/googletest/issues/2330. PiperOrigin-RevId: 284033342
* | | Googletest exportAbseil Team2019-12-051-1/+1
| | | | | | | | | | | | | | | | | | Update example Environment class destructor annotation PiperOrigin-RevId: 283986183
* | | Merge pull request #2594 from ↵Mark Barolak2019-12-051-17/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | kuzkry:remove-workaround_msvc-unneeded-const-dropping PiperOrigin-RevId: 283979494
| * | | remove MSVC workaround: cease const droppingrefs/pull/2594/headKrystian Kuzniarek2019-11-221-14/+3
| | |/ | |/|
* | | Googletest exportAbseil Team2019-12-051-1/+1
| | | | | | | | | | | | | | | | | | Internal change PiperOrigin-RevId: 283948137
* | | Googletest exportAbseil Team2019-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify use of IsTrue and IsFalse matchers. These matchers are subtle and confusing: what are they for? The docs in the code are clear, but not very accessible. googletest/googlemock/include/gmock/gmock-more-matchers.h PiperOrigin-RevId: 283393275
* | | Merge pull request #2603 from maximilianschwab:patch-1Mark Barolak2019-12-021-1/+1
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 283349646
| * | | Fixed typorefs/pull/2603/headMaximilian Schwab2019-11-251-1/+1
| | | |
* | | | Merge pull request #2607 from oyefremov:patch-1Mark Barolak2019-12-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 283349621
| * | | | Rename test case to test suiterefs/pull/2607/headOleksandr Yefremov2019-11-271-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #2583 from ChristophStrehle:masterGennadiy Rozental2019-11-271-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | PiperOrigin-RevId: 282817206
| * | | Fix compile break for Microsoft Visual Studio 2017 v141refs/pull/2583/headChristoph Strehle2019-11-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround, for those who have to compile with v141 build tools, for a bug in msvc that the compiler can't compile the WithArgsAction. see the following link for more details: https://developercommunityapi.westus.cloudapp.azure.com/content/problem/420339/googlemocks-withargs-doesnt-compile-with-permissiv.html
* | | | Merge pull request #2604 from matepek:readme-update-with-opensource-projGennadiy Rozental2019-11-261-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 282620313
| * | | | README.md: added Catch2 and Google Test Explorerrefs/pull/2604/headMate Pek2019-11-251-0/+4
| | |/ / | |/| |
* | | | Merge pull request #2593 from ↵Gennadiy Rozental2019-11-261-9/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | kuzkry:remove-workaround_msvc-namespace-scope-from-nested-class PiperOrigin-RevId: 282593823
| * | | | remove MSVC workaround: accessing namespace scope from within nested classesrefs/pull/2593/headKrystian Kuzniarek2019-11-221-9/+4
| | |_|/ | |/| |
* | | | Merge pull request #2596 from kuzkry:remove-workaround_msvc-wmain-link-errorGennadiy Rozental2019-11-262-13/+11
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 282589492
| * | | | unify googletest and googlemock main functionsrefs/pull/2596/headKrystian Kuzniarek2019-11-222-4/+9
| | | | |
| * | | | remove MSVC workaround: wmain link error in the static libraryKrystian Kuzniarek2019-11-221-9/+2
| |/ / /
* | | | Merge pull request #2597 from ↵Gennadiy Rozental2019-11-261-49/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | kuzkry:remove-workaround_Nokia-Sybian-SafeMatcherCastImpl PiperOrigin-RevId: 282581402
| * | | | remove Nokia's Symbian compiler workaround: SafeMatcherCastImplrefs/pull/2597/headKrystian Kuzniarek2019-11-221-49/+36
| | | | |
| * | | | consistency fix for SafeMatcherCastImpl member functionsKrystian Kuzniarek2019-11-221-1/+1
| |/ / /
* | | | Googletest exportAbseil Team2019-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap call to std::numeric_limits<>::max into round braces to appease MSVC. Closes #2589 PiperOrigin-RevId: 282581361
* | | | Merge pull request #2591 from kuzkry:remove-workaround_g++-using-on-operator<<Gennadiy Rozental2019-11-261-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 282575040
| * | | | remove g++ 3.3 workaround: using on operator<<refs/pull/2591/headKrystian Kuzniarek2019-11-221-4/+2
| |/ / /
* | | | Merge pull request #2588 from kuzkry:remove-workaround_g++-incorrect-commentsGennadiy Rozental2019-11-262-19/+13
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 282568282
| * | | | change incorrect commentsrefs/pull/2588/headKrystian Kuzniarek2019-11-052-19/+13
| |/ / /
* | | | Googletest exportAbseil Team2019-11-261-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | Make generating goldens work with Python 3 golden_file.write(output) fails with Python 3 with: TypeError: a bytes-like object is required, not 'str' PiperOrigin-RevId: 282316101
* | | Googletest exportAbseil Team2019-11-221-1/+1
| | | | | | | | | | | | | | | | | | Fix typo in the predicate assertion table. PiperOrigin-RevId: 281973457
* | | Merge pull request #2570 from xieyubo:1.10Gennadiy Civil2019-11-221-0/+3
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 281971090
| * | | Fix internal memory leak in Windows _Crt report.refs/pull/2571/headrefs/pull/2570/headxyb2019-11-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use "MemoryIsNotDeallocated" to aovid internal expected leak reported in Windows _Crt report, like: { #ifdef _MSC_VER MemoryIsNotDeallocated memory_is_not_deeallocated; #endif static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals(); return map; } But int the above code, only "new ThreadIdToThreadLocals()" is protected, if we invoke "insert()" function of the return value, the memory allocated in "insert()" will be reported to _Crt report also. This change try to fix this issue.
* | | | Googletest exportAbseil Team2019-11-2214-161/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard C++11 integer types in gtest-port.h. Remove testing::internal::{Int,Uint}{32,64} in favor of types guaranteed to be in <cstdint> since C++11. Tests for built-in integer type coverage are switched from {Int,Uint}64 to [unsigned] long long, which is guaranteed by C++11 to exist and be at least 64-bit wide. PiperOrigin-RevId: 281565263
* | | | Merge pull request #2569 from bgianfo:masterGennadiy Civil2019-11-201-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 281321427
| * | | | Fix FlatTuple compilation on older msvc.refs/pull/2569/headBrian Gianforcaro2019-11-161-2/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | googletest 1.10.0 fails to compile on msvc version 19.00.23917 with one compilation error: src\googletest\include\gtest\internal\gtest-internal.h(1188) : error C2039: 'FlatTupleBase<testing::internal::FlatTuple<bool,bool>,testing::internal::IndexSequence<0,1> >': is not a member of 'testing::internal::FlatTuple<bool,bool>' This PR fixes the compilation error by explicitly specifying the full type that Indices is located in the base type.
* | | | Googletest exportAbseil Team2019-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a breadcrumb about nullopt comparison near the Optional() matcher. Also add a note about how otherwise-spurious 'Eq()' may be needed in some cases. Without this, something like Field(&MyStruct::optional_field_without_equals_equals, absl::nullopt) doesn't work - it converts the nullopt to an optional<> of the non-equalable type, and fails to select the operator==(optional<>, nullopt_t) overload. The Eq() lets the type persist later into the match. PiperOrigin-RevId: 281305519
* | | | Googletest exportAbseil Team2019-11-192-2/+2
|/ / / | | | | | | | | | | | | | | | Update stale comments to point to proper location. PiperOrigin-RevId: 281157036
* | | Merge pull request #2521 from Sinclair-John:masterAndy Getz2019-11-151-1/+4
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 280666222