dnsunderland
08cb06b197
Merge branch 'master' into parameterless
2018-04-18 16:32:31 -07:00
David Sunderland
f437f8ca0d
Clone of unsubmitted cr/176529515. Introduce parameterless expectations.
2018-04-18 19:28:56 -04:00
Gennadiy Civil
4707c0ffd4
193353312
2018-04-18 10:36:12 -04:00
Gennadiy Civil
80d6e26a9c
cl/193060888
2018-04-17 19:32:15 -04:00
Gennadiy Civil
5dccf6b79e
http://cl/193060888
2018-04-17 16:22:35 -04:00
Gennadiy Civil
dff32aff97
http://cl/193060888
2018-04-17 16:12:04 -04:00
Gennadiy Civil
ec425d7160
typo
2018-04-16 12:00:37 -04:00
Gennadiy Civil
e4ab316c85
more msvc
2018-04-16 11:52:22 -04:00
Gennadiy Civil
1944bc0f51
typo
2018-04-16 11:41:36 -04:00
Gennadiy Civil
e9eff488f9
msvc warnings
2018-04-16 11:32:16 -04:00
Gennadiy Civil
bd2a1aed03
merging gmock generated matchers
2018-04-16 11:18:49 -04:00
Gennadiy Civil
9fba103156
merging, testing, this should be it
2018-04-16 10:42:08 -04:00
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
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
2dc576ec55
merging
2018-04-13 09:16:40 -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
a79851f2c2
merging
2018-04-12 14:00:38 -04:00
Gennadiy Civil
fa658e0cc0
merging
2018-04-12 13:42:47 -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
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
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
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
