Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | ||||||
* | merge | Gennadiy Civil | 2018-04-10 | 2 | -148/+4 | |
|\ | ||||||
| * | Revert "gmock actions 2" | Gennadiy Civil | 2018-04-09 | 2 | -169/+1 | |
| | | ||||||
| * | ... and this | Gennadiy Civil | 2018-04-09 | 1 | -8/+4 | |
| | | ||||||
| * | formatting | Gennadiy Civil | 2018-04-09 | 2 | -2/+3 | |
| | | ||||||
| * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 | |
| | | ||||||
| * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -3/+7 | |
| | | ||||||
| * | cont | Gennadiy Civil | 2018-04-09 | 1 | -3/+0 | |
| | | ||||||
| * | msvc | Gennadiy Civil | 2018-04-09 | 2 | -12/+13 | |
| | | ||||||
| * | more msvc | Gennadiy Civil | 2018-04-09 | 1 | -0/+15 | |
| | | ||||||
| * | msvc 14 | Gennadiy Civil | 2018-04-09 | 1 | -14/+0 | |
| | | ||||||
| * | testing msvc again | Gennadiy Civil | 2018-04-09 | 2 | -16/+14 | |
| | | ||||||
| * | More msvc 14 | Gennadiy Civil | 2018-04-09 | 1 | -0/+16 | |
| | | ||||||
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵ | Gennadiy Civil | 2018-04-10 | 3 | -9/+22 | |
|/ | | | | errors before merging the PR | |||||
* | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 | |
| | ||||||
* | merging gmock-actions 2 | Gennadiy Civil | 2018-04-06 | 1 | -1/+143 | |
| | ||||||
* | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 4 | -3/+14 | |
| | ||||||
* | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 | |
| | ||||||
* | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -1/+1 | |
| | ||||||
* | Merging matchers test | Gennadiy Civil | 2018-04-05 | 1 | -0/+3 | |
| | ||||||
* | Merging matchers test | Gennadiy Civil | 2018-04-05 | 1 | -40/+779 | |
| | ||||||
* | bad cut/paste | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | ||||||
* | More on MSVC warning C4503, decorated name length exceeded | Gennadiy Civil | 2018-04-04 | 1 | -2/+6 | |
| | ||||||
* | More on MSVC warning C4503, decorated name length exceeded | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | ||||||
* | Address MSVC warning C4503, decorated name length exceeded, name was truncated | Gennadiy Civil | 2018-04-04 | 1 | -0/+2 | |
| | ||||||
* | Fixing build break on MSVC | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | ||||||
* | merging gmock matchers 1 | Gennadiy Civil | 2018-04-04 | 1 | -37/+262 | |
| | ||||||
* | merging, gmock -1 | Gennadiy Civil | 2018-03-22 | 2 | -1/+33 | |
| | ||||||
* | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 1 | -0/+4 | |
|\ | ||||||
| * | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-01 | 2 | -2/+86 | |
| |\ | ||||||
| * | | Try to handle unsigned wchar_t (arm) a bit better | Scott Graham | 2018-02-23 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merges-1 | Gennadiy Civil | 2018-03-05 | 1 | -0/+2 | |
| |/ |/| | ||||||
* | | Merge branch 'master' into variant_matcher | Xiaoyi Zhang | 2018-02-27 | 1 | -2/+22 | |
|\ \ | ||||||
| * | | gmock merging -2 | Gennadiy Civil | 2018-02-27 | 1 | -2/+22 | |
| |/ | ||||||
* / | Add matcher for std::variant. | Xiaoyi Zhang | 2018-02-27 | 1 | -0/+64 | |
|/ | ||||||
* | moving JoinAsTuple to internal | Gennadiy Civil | 2018-02-12 | 1 | -26/+3 | |
| | ||||||
* | Merge pull request #1446 from tholsapp/master | Gennadiy Civil | 2018-02-09 | 2 | -5/+5 | |
|\ | | | | | Fixed typos |