Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Formatting changes, code sync | Gennadiy Civil | 2018-07-25 | 1 | -2/+1 |
| | |||||
* | code merge | Gennadiy Civil | 2018-07-20 | 1 | -1/+4 |
| | |||||
* | code sync | Gennadiy Civil | 2018-07-19 | 1 | -0/+1 |
| | |||||
* | Code sync | Gennadiy Civil | 2018-07-18 | 1 | -3/+20 |
| | |||||
* | Code sync, mostly formatting and removing outdates | Gennadiy Civil | 2018-07-18 | 2 | -203/+2 |
| | |||||
* | Put ifdef guard after the includes. | Adrian Moran | 2018-07-13 | 1 | -1/+1 |
| | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es> | ||||
* | Avoid full test in no exceptions are enabled. | Adrian Moran | 2018-07-12 | 1 | -5/+2 |
| | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es> | ||||
* | Fix issue #1654. | Adrian Moran | 2018-07-11 | 1 | -0/+2 |
| | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es> | ||||
* | formatting changes | Gennadiy Civil | 2018-05-23 | 1 | -1/+1 |
| | |||||
* | Formatting changes | Gennadiy Civil | 2018-05-23 | 2 | -2/+2 |
| | |||||
* | Fix gmock not building when -fno-rtti | Scott Graham | 2018-05-02 | 1 | -4/+2 |
| | | | | Fixes issue #1554. This is internal cl/195020996. | ||||
* | merged | Gennadiy Civil | 2018-04-25 | 1 | -1/+0 |
|\ | |||||
| * | Merge branch 'master' into parameterless | dnsunderland | 2018-04-18 | 2 | -4/+86 |
| |\ | |||||
| * | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations. | David Sunderland | 2018-04-18 | 2 | -1/+108 |
| | | | |||||
* | | | merging, | Gennadiy Civil | 2018-04-25 | 2 | -13/+124 |
| |/ |/| | |||||
* | | 193353312 | Gennadiy Civil | 2018-04-18 | 1 | -0/+9 |
| | | |||||
* | | cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -3/+3 |
| | | |||||
* | | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -30/+6 |
| | | |||||
* | | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -0/+42 |
| | | |||||
* | | typo | Gennadiy Civil | 2018-04-16 | 1 | -1/+1 |
| | | |||||
* | | more msvc | Gennadiy Civil | 2018-04-16 | 1 | -1/+2 |
| | | |||||
* | | typo | Gennadiy Civil | 2018-04-16 | 1 | -1/+1 |
| | | |||||
* | | msvc warnings | Gennadiy Civil | 2018-04-16 | 1 | -0/+11 |
| | | |||||
* | | merging gmock generated matchers | Gennadiy Civil | 2018-04-16 | 1 | -4/+47 |
|/ | |||||
* | merging, testing, this should be it | Gennadiy Civil | 2018-04-16 | 1 | -1/+1 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-16 | 1 | -3/+2 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-16 | 1 | -2/+3 |
| | |||||
* | more pizza | Gennadiy Civil | 2018-04-13 | 1 | -3/+2 |
| | |||||
* | more OSX pizzas | Gennadiy Civil | 2018-04-13 | 1 | -1/+2 |
| | |||||
* | osx pizzas | Gennadiy Civil | 2018-04-13 | 1 | -2/+3 |
| | |||||
* | merging gmock actions test | Gennadiy Civil | 2018-04-13 | 1 | -0/+1 |
| | |||||
* | merging, gmock actions test | Gennadiy Civil | 2018-04-13 | 1 | -1/+142 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-13 | 2 | -10/+13 |
| | |||||
* | more fixing osx libstd++ bugs | Gennadiy Civil | 2018-04-12 | 1 | -1/+2 |
| | |||||
* | fixing | Gennadiy Civil | 2018-04-12 | 1 | -0/+1 |
| | |||||
* | merging, fix OSX issue | Gennadiy Civil | 2018-04-12 | 2 | -2/+2 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-12 | 2 | -10/+8 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-12 | 1 | -3/+47 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-12 | 1 | -0/+23 |
| | |||||
* | msvc | Gennadiy Civil | 2018-04-12 | 1 | -2/+2 |
| | |||||
* | revert this one | Gennadiy Civil | 2018-04-12 | 1 | -1/+1 |
| | |||||
* | merge, ... gmock-matchers test | Gennadiy Civil | 2018-04-12 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 1 | -0/+21 |
|\ | |||||
| * | Remove multiple inheritance from "unintesting call" mock classes. | Victor Costan | 2018-04-12 | 1 | -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 cleanup | Gennadiy Civil | 2018-04-12 | 1 | -1/+7 |
|/ | |||||
* | more | Gennadiy Civil | 2018-04-11 | 1 | -1/+1 |
| | |||||
* | pizza work, cont | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 |
| | |||||
* | osx pizzas, cont | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 |
| | |||||
* | fixing osx pizza | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-10 | 1 | -3/+5 |
| |