aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test
Commit message (Collapse)AuthorAgeFilesLines
* Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-121-0/+21
| | | | | | | | | | | | | | | | | | Internal CL 156157936, which was published in commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71, introduced undefined behavior by casting a base class (internal::{Naggy,Nice,Strict}Base<MockClass>, using the curiously recurring template pattern) pointer to a derived class ({Naggy,Nice,Strict}Mock<MockClass>), in the base class' constructor. At that point, the object isn't guaranteed to have taken on the shape of the derived class, and casting is undefined behavior. The undefined behavior was caught by Chrome's CFI build bot [1], and prevents rolling googletest past that commit / CL. This commit simplifies the {Naggy,Nice,Strict}Mock class hierarchy in a way that removes the undefined behavior. [1] https://www.chromium.org/developers/testing/control-flow-integrity
* moreGennadiy Civil2018-04-111-1/+1
|
* pizza work, contGennadiy Civil2018-04-111-1/+2
|
* osx pizzas, contGennadiy Civil2018-04-111-1/+2
|
* fixing osx pizzaGennadiy Civil2018-04-111-1/+2
|
* mergingGennadiy Civil2018-04-101-3/+5
|
* mergeGennadiy Civil2018-04-102-148/+4
|\
| * Revert "gmock actions 2"Gennadiy Civil2018-04-092-169/+1
| |
| * ... and thisGennadiy Civil2018-04-091-8/+4
| |
| * formattingGennadiy Civil2018-04-092-2/+3
| |
| * tuningGennadiy Civil2018-04-091-1/+1
| |
| * tuningGennadiy Civil2018-04-091-3/+7
| |
| * contGennadiy Civil2018-04-091-3/+0
| |
| * msvcGennadiy Civil2018-04-092-12/+13
| |
| * more msvcGennadiy Civil2018-04-091-0/+15
| |
| * msvc 14Gennadiy Civil2018-04-091-14/+0
| |
| * testing msvc againGennadiy Civil2018-04-092-16/+14
| |
| * More msvc 14 Gennadiy Civil2018-04-091-0/+16
| |
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵Gennadiy Civil2018-04-103-9/+22
|/ | | | errors before merging the PR
* more warningsGennadiy Civil2018-04-061-0/+12
|
* merging gmock-actions 2Gennadiy Civil2018-04-061-1/+143
|
* Merging gMock, 2Gennadiy Civil2018-04-054-3/+14
|
* Have to wait for this oneGennadiy Civil2018-04-051-2/+2
|
* Have to wait for this oneGennadiy Civil2018-04-051-1/+1
|
* Merging matchers testGennadiy Civil2018-04-051-0/+3
|
* Merging matchers testGennadiy Civil2018-04-051-40/+779
|
* bad cut/pasteGennadiy Civil2018-04-041-1/+1
|
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-2/+6
|
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-1/+1
|
* Address MSVC warning C4503, decorated name length exceeded, name was truncatedGennadiy Civil2018-04-041-0/+2
|
* Fixing build break on MSVCGennadiy Civil2018-04-041-1/+1
|
* merging gmock matchers 1Gennadiy Civil2018-04-041-37/+262
|
* merging, gmock -1Gennadiy Civil2018-03-222-1/+33
|
* More merges, removing old dead codeGennadiy Civil2018-03-131-2/+2
|
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-051-0/+4
|\
| * Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-012-2/+86
| |\
| * | Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-231-0/+4
| | |
* | | Merges-1Gennadiy Civil2018-03-051-0/+2
| |/ |/|
* | Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-271-2/+22
|\ \
| * | gmock merging -2Gennadiy Civil2018-02-271-2/+22
| |/
* / Add matcher for std::variant.Xiaoyi Zhang2018-02-271-0/+64
|/
* moving JoinAsTuple to internalGennadiy Civil2018-02-121-26/+3
|
* Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-092-5/+5
|\ | | | | Fixed typos
| * Fixed typosTroy Holsapple2018-02-072-5/+5
| |
* | mergesGennadiy Civil2018-02-092-8/+11
|/
* Adding tests to googlemock bazelGennadiy Civil2018-01-262-6/+72
|
* Code mergesGennadiy Civil2018-01-262-3/+5
|
* [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcLoo Rong Jie2018-01-091-1/+2
| | | | and x64_windows_msvc
* Merge branch 'master' into missing-declarationsGennadiy Civil2018-01-041-8/+0
|\
| * upstreaming cl 124976692Gennadiy Civil2018-01-031-8/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 20:39:45 +0000