aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merging gmock actions test Gennadiy Civil2018-04-131-0/+1
|
* merging, gmock actions test Gennadiy Civil2018-04-131-1/+142
|
* Merge pull request #1569 from gennadiycivil/masterGennadiy Civil2018-04-132-10/+13
|\ | | | | merging
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-130-0/+0
| |\ | |/ |/|
* | Merge pull request #1568 from gennadiycivil/masterGennadiy Civil2018-04-122-10/+10
|\ \ | | | | | | merging
| | * 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
|/
* Merge pull request #1567 from gennadiycivil/masterGennadiy Civil2018-04-123-3/+67
|\ | | | | merging
| * merging Gennadiy Civil2018-04-123-3/+67
|/
* Merge pull request #1566 from gennadiycivil/masterGennadiy Civil2018-04-122-18/+37
|\ | | | | merging
| * merging Gennadiy Civil2018-04-122-18/+37
|/
* Merge pull request #1562 from gennadiycivil/masterGennadiy Civil2018-04-122-2/+16
|\ | | | | small cleanup
| * 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-124-210/+224
| |\ | |/ |/|
* | Merge pull request #1557 from pwnall/gmock-fix-ubGennadiy Civil2018-04-124-210/+224
|\ \ | | | | | | Remove multiple inheritance from "unintesting call" mock classes.
| * | Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-124-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/googletestGennadiy Civil2018-04-120-0/+0
| |\ | |/ |/|
* | Merge pull request #1561 from gennadiycivil/masterGennadiy Civil2018-04-112-18/+74
|\ \ | | | | | | Merging gmock-actions
| | * small cleanupGennadiy Civil2018-04-122-1/+15
| |/
| * ...mergingGennadiy Civil2018-04-111-1/+1
| |
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1560 from gennadiycivil/masterGennadiy Civil2018-04-111-2/+4
|\ \ | | | | | | Upstream cl/192179348
| | * mergingGennadiy Civil2018-04-111-17/+73
| |/
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1559 from gennadiycivil/masterGennadiy Civil2018-04-111-2/+2
|\ \ | | | | | | Upstream cl 191754725
| | * Upstream cl/192179348Gennadiy Civil2018-04-111-2/+4
| |/
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1558 from gennadiycivil/masterGennadiy Civil2018-04-1112-85/+388
|\ \ | | | | | | RE-Doing the merge, this time with gcc on mac in the PR
| | * mergingGennadiy Civil2018-04-111-2/+2
| |/
| * ..and this should be itGennadiy Civil2018-04-111-1/+15
| |
| * 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-1/+1
| |
| * mergingGennadiy Civil2018-04-102-6/+9
| |
| * mergingGennadiy Civil2018-04-101-7/+10
| |
| * mergeGennadiy Civil2018-04-109-260/+33
| |\ | |/ |/|
* | Include gcc on mac into PR matrixGennadiy Civil2018-04-101-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-masterGennadiy Civil2018-04-0913-303/+27
|\ \ | | | | | | Revert "gmock actions 2"
| * | Revert "gmock actions 2"Gennadiy Civil2018-04-0913-303/+27
|/ /
* | Merge pull request #1551 from gennadiycivil/masterGennadiy Civil2018-04-0913-27/+303
|\ \ | | | | | | gmock actions 2
| * | ... and thisGennadiy Civil2018-04-091-8/+4
| | |
| * | this should be itGennadiy Civil2018-04-091-4/+0
| | |
| * | yet moreGennadiy Civil2018-04-092-4/+4
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 08:03:49 +0000