Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 4 | -210/+224 |
|\ | |||||
| * | Merge pull request #1557 from pwnall/gmock-fix-ub | Gennadiy Civil | 2018-04-12 | 4 | -210/+224 |
| |\ | | | | | | | Remove multiple inheritance from "unintesting call" mock classes. | ||||
| | * | 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 | ||||
* | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 0 | -0/+0 |
|\| | |||||
| * | Merge pull request #1561 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 2 | -18/+74 |
| |\ | | | | | | | Merging gmock-actions | ||||
* | | | small cleanup | Gennadiy Civil | 2018-04-12 | 2 | -1/+15 |
| |/ |/| | |||||
* | | ...merging | Gennadiy Civil | 2018-04-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-11 | 0 | -0/+0 |
|\| | |||||
| * | Merge pull request #1560 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 1 | -2/+4 |
| |\ | | | | | | | Upstream cl/192179348 | ||||
* | | | merging | Gennadiy Civil | 2018-04-11 | 1 | -17/+73 |
| |/ |/| | |||||
* | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-11 | 0 | -0/+0 |
|\| | |||||
| * | Merge pull request #1559 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 1 | -2/+2 |
| |\ | | | | | | | Upstream cl 191754725 | ||||
* | | | Upstream cl/192179348 | Gennadiy Civil | 2018-04-11 | 1 | -2/+4 |
| |/ |/| | |||||
* | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-11 | 0 | -0/+0 |
|\| | |||||
| * | Merge pull request #1558 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 12 | -85/+388 |
| |\ | | | | | | | RE-Doing the merge, this time with gcc on mac in the PR | ||||
* | | | merging | Gennadiy Civil | 2018-04-11 | 1 | -2/+2 |
| |/ |/| | |||||
* | | ..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 | -1/+1 |
| | | |||||
* | | merging | Gennadiy Civil | 2018-04-10 | 2 | -6/+9 |
| | | |||||
* | | merging | Gennadiy Civil | 2018-04-10 | 1 | -7/+10 |
| | | |||||
* | | merge | Gennadiy Civil | 2018-04-10 | 9 | -260/+33 |
|\| | |||||
| * | Include gcc on mac into PR matrix | Gennadiy Civil | 2018-04-10 | 1 | -1/+0 |
| | | | | | | There was an error that slipped through and only showed up on PR merge (https://travis-ci.org/google/googletest/jobs/364304396/config ) , we dont want that again | ||||
| * | Merge pull request #1556 from google/revert-1551-master | Gennadiy Civil | 2018-04-09 | 13 | -303/+27 |
| |\ | | | | | | | Revert "gmock actions 2" | ||||
| | * | Revert "gmock actions 2" | Gennadiy Civil | 2018-04-09 | 13 | -303/+27 |
| |/ | |||||
| * | Merge pull request #1551 from gennadiycivil/master | Gennadiy Civil | 2018-04-09 | 13 | -27/+303 |
| |\ | | | | | | | gmock actions 2 | ||||
| | * | ... and this | Gennadiy Civil | 2018-04-09 | 1 | -8/+4 |
| | | | |||||
| | * | this should be it | Gennadiy Civil | 2018-04-09 | 1 | -4/+0 |
| | | | |||||
| | * | yet more | Gennadiy Civil | 2018-04-09 | 2 | -4/+4 |
| | | | |||||
| | * | formatting | Gennadiy Civil | 2018-04-09 | 4 | -4/+7 |
| | | | |||||
| | * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 |
| | | | |||||
| | * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -3/+7 |
| | | | |||||
| | * | more | Gennadiy Civil | 2018-04-09 | 1 | -6/+9 |
| | | | |||||
| | * | 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 | 10 | -96/+346 |
| |/ |/| | | | | | errors before merging the PR |