Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into googletest_for_asam | duxiuxing | 2018-07-19 | 1 | -1/+1 |
|\ | |||||
| * | Formatting and a link | Gennadiy Civil | 2018-07-18 | 1 | -1/+1 |
| | | |||||
* | | Fix warning C4819: The file contains a character that cannot be represented ↵ | duxiuxing | 2018-07-17 | 3 | -21/+21 |
|/ | | | | in the current code page (936). Save the file in Unicode format to prevent data loss | ||||
* | Fix gmock not building when -fno-rtti | Scott Graham | 2018-05-02 | 1 | -4/+4 |
| | | | | Fixes issue #1554. This is internal cl/195020996. | ||||
* | merging, | Gennadiy Civil | 2018-04-25 | 5 | -480/+803 |
| | |||||
* | 193353312 | Gennadiy Civil | 2018-04-18 | 1 | -4/+7 |
| | |||||
* | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -5/+13 |
| | |||||
* | test-meerging | Gennadiy Civil | 2018-04-16 | 2 | -34/+6 |
| | |||||
* | merging gmock generated matchers | Gennadiy Civil | 2018-04-16 | 2 | -264/+367 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-12 | 2 | -0/+20 |
| | |||||
* | merging | Gennadiy Civil | 2018-04-12 | 1 | -18/+14 |
| | |||||
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 3 | -210/+203 |
|\ | |||||
| * | Remove multiple inheritance from "unintesting call" mock classes. | Victor Costan | 2018-04-12 | 3 | -210/+203 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+8 |
|/ | |||||
* | 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 |
| | |||||
* | merge | Gennadiy Civil | 2018-04-10 | 3 | -96/+18 |
|\ | |||||
| * | Revert "gmock actions 2" | Gennadiy Civil | 2018-04-09 | 8 | -105/+25 |
| | | |||||
| * | yet more | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 |
| | | |||||
| * | continued | Gennadiy Civil | 2018-04-09 | 4 | -6/+8 |
| | | |||||
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵ | Gennadiy Civil | 2018-04-10 | 5 | -77/+310 |
|/ | | | | 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 | ||||
* | | linkage, fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
* | | fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -0/+2 |
| | | |||||
* | | 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 | 1 | -17/+73 |
|/ | |||||
* | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 4 | -375/+479 |
| | |||||
* | 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 |
| | |||||
* | merging gmock matchers 1 | Gennadiy Civil | 2018-04-04 | 1 | -29/+169 |
| | |||||
* | merging gmock-matchers.h 3 | Gennadiy Civil | 2018-03-26 | 1 | -13/+36 |
| | |||||
* | merging gmock-matchers.h 2 | Gennadiy Civil | 2018-03-26 | 1 | -7/+44 |
| | |||||
* | Upstreaming FloatingEq2Matcher, | Gennadiy Civil | 2018-03-26 | 1 | -9/+13 |
| | |||||
* | Merging gmock-matchers.h -2 | Gennadiy Civil | 2018-03-23 | 1 | -29/+208 |
| | |||||
* | gmock-matchers merging -2 | Gennadiy Civil | 2018-03-23 | 1 | -10/+250 |
| | |||||
* | merging, gmock -1 | Gennadiy Civil | 2018-03-22 | 1 | -24/+45 |
| | |||||
* | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 1 | -5/+6 |
| | |||||
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 1 | -0/+2 |
|\ | |||||
| * | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-01 | 1 | -44/+258 |
| |\ | |||||
| * | | Try to handle unsigned wchar_t (arm) a bit better | Scott Graham | 2018-02-23 | 1 | -0/+2 |
| | | | |||||
* | | | Merges-1 | Gennadiy Civil | 2018-03-05 | 1 | -4/+3 |
| |/ |/| |