googletest

Commit Graph

Author	SHA1	Message	Date
Scott Graham	a9653c401e	Fix gmock not building when -fno-rtti Fixes issue #1554. This is internal cl/195020996.	7 years ago
Gennadiy Civil	b539167cf0	merging,	7 years ago
David Sunderland	2d3024f5bd	Fix friend declaration to use GTEST_API_ decl spec.	7 years ago
David Sunderland	b2f97ab317	Revert useless use of GTEST_API_ on WithoutMatchers decl.	7 years ago
David Sunderland	1c79ad7a56	Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC?	7 years ago
David Sunderland	d5725da968	Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors.	7 years ago
David Sunderland	f437f8ca0d	Clone of unsubmitted cr/176529515. Introduce parameterless expectations.	7 years ago
Gennadiy Civil	4707c0ffd4	193353312	7 years ago
Gennadiy Civil	dff32aff97	http://cl/193060888	7 years ago
Gennadiy Civil	3f88bb1831	test-meerging	7 years ago
Gennadiy Civil	bd2a1aed03	merging gmock generated matchers	7 years ago
Gennadiy Civil	a79851f2c2	merging	7 years ago
Gennadiy Civil	fa658e0cc0	merging	7 years ago
Gennadiy Civil	e77deb29a6	small cleanup	7 years ago
Victor Costan	1324e2d706	Remove multiple inheritance from "unintesting call" mock classes. Internal CL 156157936, which was published in commit `fe402c2779`, 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	7 years ago
Gennadiy Civil	8654c1ca10	merging	7 years ago
Gennadiy Civil	ab84d14281	Upstream cl/192179348	7 years ago
Gennadiy Civil	5cd213ea5e	..and this should be it	7 years ago
Gennadiy Civil	e1071eb949	RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR	7 years ago
Gennadiy Civil	ca54b67303	Revert "gmock actions 2"	7 years ago
Gennadiy Civil	f5871009e6	yet more	7 years ago
Gennadiy Civil	e0b3c269c2	continued	7 years ago
Victor Costan	51f8ad47df	Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. Commit `fe402c2779` 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	7 years ago
Gennadiy Civil	701e1e5dc1	linkage, fixing MSVC	7 years ago
Gennadiy Civil	2d4d4ef739	fixing MSVC	7 years ago
Gennadiy Civil	c75b76e20a	warnings	7 years ago
Gennadiy Civil	04e31881fc	cont - 2	7 years ago
Gennadiy Civil	32ac949254	cont	7 years ago
Gennadiy Civil	1831ac9361	more warnings	7 years ago
Gennadiy Civil	eb3e4aac2e	deal with MSVC warn, cont 1	7 years ago
Gennadiy Civil	50c0bcd7e3	Cont. deal with MCVS warnings	7 years ago
Gennadiy Civil	b5c87fbcb6	Deal with MCVS warnings	7 years ago
Gennadiy Civil	88fc7d7552	merging gmock-actions 2	7 years ago
Gennadiy Civil	fe402c2779	Merging gMock, 2	7 years ago
Gennadiy Civil	7e5f90d378	formatting	7 years ago
Gennadiy Civil	928636135b	And more MCVS warnings	7 years ago
Gennadiy Civil	e0f4cf0561	fixing MCVS warn	7 years ago
Gennadiy Civil	e55089ec11	merging gmock matchers 1	7 years ago
Gennadiy Civil	6aae206bc2	merging gmock-matchers.h 3	7 years ago
Gennadiy Civil	23187058e7	merging gmock-matchers.h 2	7 years ago
Gennadiy Civil	8ea10d3878	Upstreaming FloatingEq2Matcher,	7 years ago
Gennadiy Civil	b907c26740	Merging gmock-matchers.h -2	7 years ago
Gennadiy Civil	466a49ae30	gmock-matchers merging -2	7 years ago
Gennadiy Civil	b7c568326c	merging, gmock -1	7 years ago
Gennadiy Civil	080fcbe0aa	cl 189032107	7 years ago
Gennadiy Civil	a178cc7ef7	merge, again, IsRecursiveContainer	7 years ago
Gennadiy Civil	af463c43ac	More merges, removing old dead code	7 years ago
Gennadiy Civil	0d5e01ad7b	Merges-1	7 years ago
Gennadiy Civil	2bd1750ba7	gmock merging -2	7 years ago
Xiaoyi Zhang	190e2cdd0b	Add matcher for std::variant.	7 years ago

1 2

66 Commits (98a0d007d7092b72eea0e501bb9ad17908a1a036)