zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,360 Commits 10 Branches 30 Tags
ecbcd99c4f00aecfb93743ffdfbffade6abd5a85
Commit Graph
144 Commits
Author SHA1 Message Date
Gennadiy Civil b2d81b4fb2 merge, ... gmock-matchers test 2018-04-12 09:45:07 -04:00
Gennadiy Civil 07f3bdd4c9 Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:13:38 -04:00
Gennadiy Civil e77deb29a6 small cleanup 2018-04-12 09:12:02 -04:00
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
 2018-04-12 00:48:30 -07:00
Gennadiy Civil 6a7573a7de more 2018-04-11 09:55:36 -04:00
Gennadiy Civil 039d9b54c2 pizza work, cont 2018-04-11 09:47:38 -04:00
Gennadiy Civil f15fd9610b osx pizzas, cont 2018-04-11 09:33:51 -04:00
Gennadiy Civil b15be9a819 fixing osx pizza 2018-04-11 09:20:48 -04:00
Gennadiy Civil 9bc82ce725 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil 39c58da187 merge 2018-04-10 16:10:34 -04:00
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 2018-04-10 15:57:16 -04:00
Gennadiy Civil ca54b67303 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil 64d24b810f ... and this 2018-04-09 16:24:30 -04:00
Gennadiy Civil 05b5a53898 formatting 2018-04-09 15:50:19 -04:00
Gennadiy Civil 2de24fbf7a tuning 2018-04-09 15:39:12 -04:00
Gennadiy Civil 055f32199a tuning 2018-04-09 15:38:38 -04:00
Gennadiy Civil 44da2b9ac5 cont 2018-04-09 15:23:00 -04:00
Gennadiy Civil e93a0ece26 msvc 2018-04-09 13:51:01 -04:00
Gennadiy Civil c4684b49cf more msvc 2018-04-09 12:03:40 -04:00
Gennadiy Civil 431bfdcaf4 msvc 14 2018-04-09 11:48:02 -04:00
Gennadiy Civil 8bc7c631e8 testing msvc again 2018-04-09 11:35:01 -04:00
Gennadiy Civil c4e3d77ddc More msvc 14 2018-04-09 11:22:11 -04:00
Gennadiy Civil 5fe8de5ded more warnings 2018-04-06 11:40:04 -04:00
Gennadiy Civil 88fc7d7552 merging gmock-actions 2 2018-04-06 09:50:01 -04:00
Gennadiy Civil fe402c2779 Merging gMock, 2 2018-04-05 16:09:17 -04:00
Gennadiy Civil 7045138a0d Have to wait for this one 2018-04-05 11:59:59 -04:00
Gennadiy Civil 66eaf9f0eb Have to wait for this one 2018-04-05 11:55:25 -04:00
Gennadiy Civil af93d59eb7 Merging matchers test 2018-04-05 11:35:20 -04:00
Gennadiy Civil 0cd6a4f5f5 Merging matchers test 2018-04-05 11:34:19 -04:00
Gennadiy Civil d81b6a0c4c bad cut/paste 2018-04-04 15:46:04 -04:00
Gennadiy Civil a608d4a362 More on MSVC warning C4503, decorated name length exceeded 2018-04-04 15:44:27 -04:00
Gennadiy Civil 6f4e93943a More on MSVC warning C4503, decorated name length exceeded 2018-04-04 15:29:05 -04:00
Gennadiy Civil 5b3d27729b Address MSVC warning C4503, decorated name length exceeded, name was truncated 2018-04-04 15:07:52 -04:00
Gennadiy Civil aa14cc4285 Fixing build break on MSVC 2018-04-04 14:48:06 -04:00
Gennadiy Civil e55089ec11 merging gmock matchers 1 2018-04-04 14:05:00 -04:00
Gennadiy Civil b7c568326c merging, gmock -1 2018-03-22 15:35:37 -04:00
Gennadiy Civil af463c43ac More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Gennadiy Civil a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil 0d5e01ad7b Merges-1 2018-03-05 12:26:15 -05:00
Gennadiy Civil f8fbe1c821 Merge branch 'master' into unsigned-wchar 2018-03-01 11:18:17 -05:00
Xiaoyi Zhang 576d689c19 Merge branch 'master' into variant_matcher 2018-02-27 16:03:36 -05:00
Gennadiy Civil 2bd1750ba7 gmock merging -2 2018-02-27 13:51:09 -05:00
Xiaoyi Zhang 190e2cdd0b Add matcher for std::variant. 2018-02-27 11:36:21 -05:00
Scott Graham 567b40eeb1 Try to handle unsigned wchar_t (arm) a bit better 2018-02-23 12:28:09 -08:00
Gennadiy Civil 225e6741ac moving JoinAsTuple to internal 2018-02-12 16:42:12 -05:00
Gennadiy Civil 22a115055a Merge pull request #1446 from tholsapp/master 
Fixed typos
 2018-02-09 11:34:26 -05:00
Gennadiy Civil ec7faa943d merges 2018-02-09 10:41:09 -05:00
Troy Holsapple c8510504dd Fixed typos 2018-02-07 22:06:00 -08:00
Gennadiy Civil 6c0c389601 Adding tests to googlemock bazel 2018-01-26 16:30:57 -05:00
Gennadiy Civil fbb48a7708 Code merges 2018-01-26 11:57:58 -05:00