aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest ↵David Sunderland2018-04-185-270/+438
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into parameterless
| | | * \ \ \ \ Merge branch 'master' into parameterlessdnsunderland2018-04-185-270/+438
| | | |\ \ \ \ \
| | * | | | | | | Don't use generalized initializer list; is C++11 extension.David Sunderland2018-04-181-1/+1
| | |/ / / / / /
| | * | | | | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-187-13/+426
| | | | | | | |
| * | | | | | | merging, Gennadiy Civil2018-04-258-493/+929
| | |_|/ / / / | |/| | | | |
| * | | | | | reverting, testGennadiy Civil2018-04-191-13/+3
| | | | | | |
| * | | | | | reverting just to test Gennadiy Civil2018-04-191-1/+1
| | | | | | |
| * | | | | | testingGennadiy Civil2018-04-191-12/+12
| | | | | | |
| * | | | | | more typosGennadiy Civil2018-04-181-1/+1
| | | | | | |
| * | | | | | msvcGennadiy Civil2018-04-181-8/+6
| | | | | | |
| * | | | | | more typosGennadiy Civil2018-04-181-3/+2
| | | | | | |
| * | | | | | typoGennadiy Civil2018-04-181-7/+7
| | | | | | |
| * | | | | | move only types docsGennadiy Civil2018-04-181-112/+93
| | | | | | |
| * | | | | | typoGennadiy Civil2018-04-181-0/+4
| | | | | | |
| * | | | | | typoGennadiy Civil2018-04-181-1/+1
| | | | | | |
| * | | | | | http://cl/193386206Gennadiy Civil2018-04-181-0/+9
| | | | | | |
| * | | | | | merge, explicit, ( should be it)Gennadiy Civil2018-04-181-1/+1
| | |/ / / / | |/| | | |
| * | | | | 193353312Gennadiy Civil2018-04-182-4/+16
| | | | | |
| * | | | | cl/193060888Gennadiy Civil2018-04-171-3/+3
| | | | | |
| * | | | | http://cl/193060888Gennadiy Civil2018-04-171-30/+6
| | | | | |
| * | | | | http://cl/193060888Gennadiy Civil2018-04-172-5/+55
| | | | | |
| * | | | | test-meergingGennadiy Civil2018-04-162-34/+6
| | | | | |
| * | | | | typoGennadiy Civil2018-04-161-1/+1
| | | | | |
| * | | | | more msvcGennadiy Civil2018-04-161-1/+2
| | | | | |
| * | | | | typoGennadiy Civil2018-04-161-1/+1
| | | | | |
| * | | | | msvc warningsGennadiy Civil2018-04-161-0/+11
| | | | | |
| * | | | | merging gmock generated matchersGennadiy Civil2018-04-163-268/+414
| |/ / / /
| * | | | merging, testing, this should be itGennadiy Civil2018-04-161-1/+1
| | | | |
| * | | | mergingGennadiy Civil2018-04-161-3/+2
| | | | |
| * | | | mergingGennadiy Civil2018-04-161-2/+3
| | | | |
| * | | | more pizzaGennadiy Civil2018-04-131-3/+2
| | | | |
| * | | | more OSX pizzasGennadiy Civil2018-04-131-1/+2
| | | | |
| * | | | osx pizzasGennadiy Civil2018-04-131-2/+3
| | | | |
| * | | | merging gmock actions test Gennadiy Civil2018-04-131-0/+1
| | | | |
| * | | | merging, gmock actions test Gennadiy Civil2018-04-131-1/+142
| | | | |
| * | | | 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
| | | | |
| * | | | merging Gennadiy Civil2018-04-123-3/+67
| | | | |
| * | | | merging Gennadiy Civil2018-04-122-18/+37
| | | | |
| * | | | 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
| |\ \ \ \
| | * | | | 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
| * | | | | small cleanupGennadiy Civil2018-04-122-1/+15
| |/ / / /
| * | | | ...mergingGennadiy Civil2018-04-111-1/+1
| | | | |
| * | | | mergingGennadiy Civil2018-04-111-17/+73
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 22:02:16 +0000