External/googletest
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,040 Commits 1 Branch 22 Tags 13 MiB
51b65058ad
Commit Graph

2040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
1c6e68cf6c merging 2018-04-16 10:34:07 -04:00
Gennadiy Civil
26c10dc7e6 merging 2018-04-16 10:16:48 -04:00
Gennadiy Civil
247ded3236
Merge pull request #1571 from gennadiycivil/master 
merging, gmock actions test
 2018-04-14 19:24:19 -04:00
Gennadiy Civil
d84eb86df5 more pizza 2018-04-13 16:04:34 -04:00
Gennadiy Civil
f45728a5ac more OSX pizzas 2018-04-13 15:48:57 -04:00
Gennadiy Civil
b74a1af00f osx pizzas 2018-04-13 11:49:37 -04:00
Gennadiy Civil
f9bd6180de merging gmock actions test 2018-04-13 11:02:55 -04:00
Gennadiy Civil
0bfa823785 merging, gmock actions test 2018-04-13 11:02:25 -04:00
Gennadiy Civil
38de61d73b
Merge pull request #1569 from gennadiycivil/master 
merging
 2018-04-13 09:41:33 -04:00
Gennadiy Civil
6d31084797 Merge branch 'master' of https://github.com/google/googletest 2018-04-13 09:16:56 -04:00
Gennadiy Civil
2dc576ec55 merging 2018-04-13 09:16:40 -04:00
Gennadiy Civil
0957cce368
Merge pull request #1568 from gennadiycivil/master 
merging
 2018-04-12 18:56:57 -04:00
Gennadiy Civil
f7330f9f14 more fixing osx libstd++ bugs 2018-04-12 17:00:31 -04:00
Gennadiy Civil
65380492b2 fixing 2018-04-12 16:32:03 -04:00
Gennadiy Civil
dc4f5638c2 merging, fix OSX issue 2018-04-12 15:45:21 -04:00
Gennadiy Civil
092ca91072 merging 2018-04-12 14:46:57 -04:00
Gennadiy Civil
6fb65b8215
Merge pull request #1567 from gennadiycivil/master 
merging
 2018-04-12 14:41:48 -04:00
Gennadiy Civil
a79851f2c2 merging 2018-04-12 14:00:38 -04:00
Gennadiy Civil
3ccd6e3809
Merge pull request #1566 from gennadiycivil/master 
merging
 2018-04-12 13:55:37 -04:00
Gennadiy Civil
fa658e0cc0 merging 2018-04-12 13:42:47 -04:00
Gennadiy Civil
531e29485c
Merge pull request #1562 from gennadiycivil/master 
small cleanup
 2018-04-12 11:45:40 -04:00
Gennadiy Civil
c67f51b5dc msvc 2018-04-12 11:32:17 -04:00
Gennadiy Civil
9b5940e040 revert this one 2018-04-12 10:28:02 -04:00
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
b640d8743d
Merge pull request #1557 from pwnall/gmock-fix-ub 
Remove multiple inheritance from "unintesting call" mock classes.
 2018-04-12 09:13:11 -04:00
Gennadiy Civil
854adb087b Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:12:15 -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
fdb57f8571
Merge pull request #1561 from gennadiycivil/master 
Merging gmock-actions
 2018-04-11 16:06:23 -04:00
Gennadiy Civil
373481c5a9 ...merging 2018-04-11 15:46:57 -04:00
Gennadiy Civil
ef17a9f98a Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:38:25 -04:00
Gennadiy Civil
6273647250
Merge pull request #1560 from gennadiycivil/master 
Upstream cl/192179348
 2018-04-11 15:38:15 -04:00
Gennadiy Civil
8654c1ca10 merging 2018-04-11 15:33:31 -04:00
Gennadiy Civil
af4cfd5088 Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:24:25 -04:00
Gennadiy Civil
ab84d14281 Upstream cl/192179348 2018-04-11 15:24:04 -04:00
Gennadiy Civil
b4429c9219
Merge pull request #1559 from gennadiycivil/master 
Upstream cl 191754725
 2018-04-11 13:57:33 -04:00
Gennadiy Civil
106e731e68 Merge branch 'master' of https://github.com/google/googletest 2018-04-11 13:20:55 -04:00
Gennadiy Civil
c13ab6003b merging 2018-04-11 13:20:36 -04:00
Gennadiy Civil
d5988e7dd0
Merge pull request #1558 from gennadiycivil/master 
RE-Doing the merge, this time with gcc on mac in the PR
 2018-04-11 10:22:10 -04:00
Gennadiy Civil
5cd213ea5e ..and this should be it 2018-04-11 10:10:24 -04: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
6f9db26159 merging 2018-04-10 16:34:21 -04:00
Gennadiy Civil
9bc82ce725 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil
25d8176e4f merging 2018-04-10 16:18:23 -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