eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,839 Commits 13 Branches 14 Tags 23 MiB
f2738b31b2
Commit Graph

1839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
f2738b31b2 merging 2018-04-16 10:16:48 -04:00
Gennadiy Civil
69534f21b5 Merge pull request #1571 from gennadiycivil/master 
merging, gmock actions test
 2018-04-14 19:24:19 -04:00
Gennadiy Civil
0d71fbfef1 more pizza 2018-04-13 16:04:34 -04:00
Gennadiy Civil
e5adb95cc5 more OSX pizzas 2018-04-13 15:48:57 -04:00
Gennadiy Civil
59b7952275 osx pizzas 2018-04-13 11:49:37 -04:00
Gennadiy Civil
cd1ceb89fe merging gmock actions test 2018-04-13 11:02:55 -04:00
Gennadiy Civil
b88d415261 merging, gmock actions test 2018-04-13 11:02:25 -04:00
Gennadiy Civil
35292665ab Merge pull request #1569 from gennadiycivil/master 
merging
 2018-04-13 09:41:33 -04:00
Gennadiy Civil
b02605c22f Merge branch 'master' of https://github.com/google/googletest 2018-04-13 09:16:56 -04:00
Gennadiy Civil
bbb66b6d85 merging 2018-04-13 09:16:40 -04:00
Gennadiy Civil
9cf398c4eb Merge pull request #1568 from gennadiycivil/master 
merging
 2018-04-12 18:56:57 -04:00
Gennadiy Civil
3b75be525c more fixing osx libstd++ bugs 2018-04-12 17:00:31 -04:00
Gennadiy Civil
1d26f6b670 fixing 2018-04-12 16:32:03 -04:00
Gennadiy Civil
278da818bb merging, fix OSX issue 2018-04-12 15:45:21 -04:00
Gennadiy Civil
2cb8105063 merging 2018-04-12 14:46:57 -04:00
Gennadiy Civil
d6166e52d0 Merge pull request #1567 from gennadiycivil/master 
merging
 2018-04-12 14:41:48 -04:00
Gennadiy Civil
d6bfdebf36 merging 2018-04-12 14:00:38 -04:00
Gennadiy Civil
bf0752c934 Merge pull request #1566 from gennadiycivil/master 
merging
 2018-04-12 13:55:37 -04:00
Gennadiy Civil
c5ccc8f35f merging 2018-04-12 13:42:47 -04:00
Gennadiy Civil
1f4f7c5c80 Merge pull request #1562 from gennadiycivil/master 
small cleanup
 2018-04-12 11:45:40 -04:00
Gennadiy Civil
b8af6195d7 msvc 2018-04-12 11:32:17 -04:00
Gennadiy Civil
acfc19b62a revert this one 2018-04-12 10:28:02 -04:00
Gennadiy Civil
6ebe245ae7 merge, ... gmock-matchers test 2018-04-12 09:45:07 -04:00
Gennadiy Civil
06f3a861b6 Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:13:38 -04:00
Gennadiy Civil
7b2722cdbc 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
363d9cf4d5 Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:12:15 -04:00
Gennadiy Civil
dea55d0bf0 small cleanup 2018-04-12 09:12:02 -04:00
Victor Costan
75b1be4ad1 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
b9f3c4b47b Merge pull request #1561 from gennadiycivil/master 
Merging gmock-actions
 2018-04-11 16:06:23 -04:00
Gennadiy Civil
c26192aada ...merging 2018-04-11 15:46:57 -04:00
Gennadiy Civil
c91c735d93 Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:38:25 -04:00
Gennadiy Civil
6979a13236 Merge pull request #1560 from gennadiycivil/master 
Upstream cl/192179348
 2018-04-11 15:38:15 -04:00
Gennadiy Civil
c54f1e884d merging 2018-04-11 15:33:31 -04:00
Gennadiy Civil
1370a1628d Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:24:25 -04:00
Gennadiy Civil
41c224c80c Upstream cl/192179348 2018-04-11 15:24:04 -04:00
Gennadiy Civil
9ec015a68d Merge pull request #1559 from gennadiycivil/master 
Upstream cl 191754725
 2018-04-11 13:57:33 -04:00
Gennadiy Civil
aebd48e0cf Merge branch 'master' of https://github.com/google/googletest 2018-04-11 13:20:55 -04:00
Gennadiy Civil
c0ffe6ed80 merging 2018-04-11 13:20:36 -04:00
Gennadiy Civil
25f695a66f 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
797c6f1be1 ..and this should be it 2018-04-11 10:10:24 -04:00
Gennadiy Civil
d0923d2754 more 2018-04-11 09:55:36 -04:00
Gennadiy Civil
720527ec6c pizza work, cont 2018-04-11 09:47:38 -04:00
Gennadiy Civil
1b1d0bc874 osx pizzas, cont 2018-04-11 09:33:51 -04:00
Gennadiy Civil
1d07a24ea0 fixing osx pizza 2018-04-11 09:20:48 -04:00
Gennadiy Civil
2acb60eb5b merging 2018-04-10 16:34:21 -04:00
Gennadiy Civil
fed44cc0c2 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil
6ed2d51c44 merging 2018-04-10 16:18:23 -04:00
Gennadiy Civil
346f1f5734 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
ec1df5b40f 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
2ae55f54bf Include gcc on mac into PR matrix 
There was an error that slipped through and only showed up on PR merge (https://travis-ci.org/google/googletest/jobs/364304396/config ) , we dont want that again
 2018-04-10 11:28:16 -04:00