aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into parameterlessdnsunderland2018-04-182-4/+86
|\
| * 193353312Gennadiy Civil2018-04-181-0/+9
| |
| * cl/193060888Gennadiy Civil2018-04-171-3/+3
| |
| * http://cl/193060888Gennadiy Civil2018-04-171-30/+6
| |
| * http://cl/193060888Gennadiy Civil2018-04-171-0/+42
| |
| * typoGennadiy Civil2018-04-161-1/+1
| |
| * more msvcGennadiy Civil2018-04-161-1/+2
| |
| * typoGennadiy Civil2018-04-161-1/+1
| |
| * msvc warningsGennadiy Civil2018-04-161-0/+11
| |
| * merging gmock generated matchersGennadiy Civil2018-04-161-4/+47
| |
* | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-182-1/+108
|/
* merging, testing, this should be itGennadiy Civil2018-04-161-1/+1
|
* mergingGennadiy Civil2018-04-161-3/+2
|
* mergingGennadiy Civil2018-04-161-2/+3
|
* more pizzaGennadiy Civil2018-04-131-3/+2
|
* more OSX pizzasGennadiy Civil2018-04-131-1/+2
|
* osx pizzasGennadiy Civil2018-04-131-2/+3
|
* merging gmock actions test Gennadiy Civil2018-04-131-0/+1
|
* merging, gmock actions test Gennadiy Civil2018-04-131-1/+142
|
* mergingGennadiy Civil2018-04-132-10/+13
|
* more fixing osx libstd++ bugsGennadiy Civil2018-04-121-1/+2
|
* fixing Gennadiy Civil2018-04-121-0/+1
|
* merging, fix OSX issueGennadiy Civil2018-04-122-2/+2
|
* mergingGennadiy Civil2018-04-122-10/+8
|
* merging Gennadiy Civil2018-04-121-3/+47
|
* merging Gennadiy Civil2018-04-121-0/+23
|
* msvcGennadiy Civil2018-04-121-2/+2
|
* revert this oneGennadiy Civil2018-04-121-1/+1
|
* merge, ... gmock-matchers testGennadiy Civil2018-04-121-3/+3
|
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-121-0/+21
|\
| * 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
* | small cleanupGennadiy Civil2018-04-121-1/+7
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 23:44:03 +0000