Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 4 | -210/+224 |
|\ | |||||
| * | Remove multiple inheritance from "unintesting call" mock classes. | Victor Costan | 2018-04-12 | 4 | -210/+224 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+15 |
|/ | |||||
* | ...merging | Gennadiy Civil | 2018-04-11 | 1 | -1/+1 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-11 | 1 | -17/+73 |
| | |||||
* | Upstream cl/192179348 | Gennadiy Civil | 2018-04-11 | 1 | -2/+4 |
| | |||||
* | ..and this should be it | Gennadiy Civil | 2018-04-11 | 1 | -1/+15 |
| | |||||
* | 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 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-10 | 1 | -7/+10 |
| | |||||
* | merge | Gennadiy Civil | 2018-04-10 | 7 | -255/+30 |
|\ | |||||
| * | Revert "gmock actions 2" | Gennadiy Civil | 2018-04-09 | 12 | -290/+27 |
| | | |||||
| * | ... and this | Gennadiy Civil | 2018-04-09 | 1 | -8/+4 |
| | | |||||
| * | yet more | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 |
| | | |||||
| * | formatting | Gennadiy Civil | 2018-04-09 | 3 | -3/+4 |
| | | |||||
| * | 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 | 2 | -16/+15 |
| | | |||||
| * | msvc 14 | Gennadiy Civil | 2018-04-09 | 2 | -14/+16 |
| | | |||||
| * | testing msvc again | Gennadiy Civil | 2018-04-09 | 2 | -16/+14 |
| | | |||||
| * | More msvc 14 | Gennadiy Civil | 2018-04-09 | 1 | -0/+16 |
| | | |||||
| * | And also silence for MSVS14 | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 |
| | | |||||
| * | preproc syntax ( I can never remember it) | Gennadiy Civil | 2018-04-09 | 1 | -5/+9 |
| | | |||||
| * | syntax | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 |
| | | |||||
| * | cont. | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 |
| | | |||||
| * | continued | Gennadiy Civil | 2018-04-09 | 5 | -7/+8 |
| | | |||||
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵ | Gennadiy Civil | 2018-04-10 | 9 | -93/+342 |
|/ | | | | errors before merging the PR | ||||
* | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-09 | 1 | -30/+60 |
|\ | |||||
| * | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. | Victor Costan | 2018-04-06 | 1 | -30/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 published the changes in internal CL 156157936, but missed the diff in gmock-generated-nice-strict.h.pump. This makes it difficult to reason about the change, because the .pump file is more concise than the generated file. This PR was tested by re-generating the .h file using the command below and checking the git diff. ./googletest/scripts/pump.py \ googlemock/include/gmock/gmock-generated-nice-strict.h.pump | ||||
* | | more mcvs fixing | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 |
| | | |||||
* | | linkage, fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
* | | fixing MSVC | Gennadiy Civil | 2018-04-06 | 2 | -1/+3 |
| | | |||||
* | | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 |
| | | |||||
* | | warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+2 |
| | | |||||
* | | cont - 2 | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
* | | cont | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
* | | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
* | | deal with MSVC warn, cont 1 | Gennadiy Civil | 2018-04-06 | 1 | -2/+1 |
| | | |||||
* | | Cont. deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 2 | -2/+16 |
| | | |||||
* | | Deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+6 |
| | | |||||
* | | merging gmock-actions 2 | Gennadiy Civil | 2018-04-06 | 2 | -18/+216 |
|/ | |||||
* | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 9 | -420/+573 |
| | |||||
* | formatting | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 |
| | |||||
* | And more MCVS warnings | Gennadiy Civil | 2018-04-05 | 1 | -5/+4 |
| | |||||
* | fixing MCVS warn | Gennadiy Civil | 2018-04-05 | 1 | -0/+10 |
| |