Commit Graph

141 Commits

Author SHA1 Message Date
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
97eced2f22 Update gmock_output_test.py 2018-08-09 15:24:43 -04:00
Gennadiy Civil
509653b8f6 Formatting change for auto code management, no functionality changes
Merge branch 'master' of https://github.com/google/googletest
2018-08-09 10:51:49 -04:00
Gennadiy Civil
7fd9b32610 small cleanup, np functional changes 2018-08-07 10:38:41 -04:00
Gennadiy Civil
4747aa2321 automatic code sync mgt, comment only 2018-08-06 15:40:21 -04:00
Gennadiy Civil
b9f30b8d67 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
Gennadiy Civil
c0f448fde4 Formatting changes, code sync 2018-07-25 10:24:13 -04:00
Gennadiy Civil
68683d415c code merge 2018-07-20 11:28:58 -04:00
Gennadiy Civil
21a1dae1b5 code sync 2018-07-19 12:42:39 -04:00
Gennadiy Civil
c38120ec6f Code sync 2018-07-18 11:51:14 -04:00
Gennadiy Civil
db4c08167d Code sync, mostly formatting and removing outdates 2018-07-18 11:30:36 -04:00
Adrian Moran
e7e574767d Put ifdef guard after the includes.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-13 08:53:03 +02:00
Adrian Moran
0201c9ddde Avoid full test in no exceptions are enabled.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-12 15:10:08 +02:00
Adrian Moran
5cad1bb286 Fix issue #1654.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-11 14:59:01 +02:00
Gennadiy Civil
3bde81a48b formatting changes 2018-05-23 11:49:11 -04:00
Gennadiy Civil
5bf664a82c Formatting changes 2018-05-23 11:03:31 -04:00
Scott Graham
7550a4c571 Fix gmock not building when -fno-rtti
Fixes issue #1554. This is internal cl/195020996.
2018-05-02 11:14:39 -07:00
Gennadiy Civil
63e8124d63 merged 2018-04-25 13:16:19 -04:00
Gennadiy Civil
edaeb8bc88 merging, 2018-04-25 13:10:41 -04:00
dnsunderland
e7ef46473f Merge branch 'master' into parameterless 2018-04-18 16:32:31 -07:00
David Sunderland
cf7b25961a Clone of unsubmitted cr/176529515. Introduce parameterless expectations. 2018-04-18 19:28:56 -04:00
Gennadiy Civil
609802ef23 193353312 2018-04-18 10:36:12 -04:00
Gennadiy Civil
cdc2f4b725 cl/193060888 2018-04-17 19:32:15 -04:00
Gennadiy Civil
7690cb75a0 http://cl/193060888 2018-04-17 16:22:35 -04:00
Gennadiy Civil
4308455071 http://cl/193060888 2018-04-17 16:12:04 -04:00
Gennadiy Civil
cc258bb44d typo 2018-04-16 12:00:37 -04:00
Gennadiy Civil
9290af3a03 more msvc 2018-04-16 11:52:22 -04:00
Gennadiy Civil
47e8442193 typo 2018-04-16 11:41:36 -04:00
Gennadiy Civil
532cd75c14 msvc warnings 2018-04-16 11:32:16 -04:00
Gennadiy Civil
b15c15ac6e merging gmock generated matchers 2018-04-16 11:18:49 -04:00
Gennadiy Civil
e240d4a180 merging, testing, this should be it 2018-04-16 10:42:08 -04:00
Gennadiy Civil
220fa3589e merging 2018-04-16 10:34:07 -04:00
Gennadiy Civil
f2738b31b2 merging 2018-04-16 10:16:48 -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
bbb66b6d85 merging 2018-04-13 09:16:40 -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
d6bfdebf36 merging 2018-04-12 14:00:38 -04:00
Gennadiy Civil
c5ccc8f35f merging 2018-04-12 13:42:47 -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
dea55d0bf0 small cleanup 2018-04-12 09:12:02 -04:00