Commit Graph
141 Commits
Author SHA1 Message Date
Gennadiy Civil a3c0dd0f4d Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil 5eb263569b Update gmock_output_test.py 2018-08-09 15:24:43 -04:00
Gennadiy Civil 063a90b391 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 b78c3b8e00 small cleanup, np functional changes 2018-08-07 10:38:41 -04:00
Gennadiy Civil 24edf4e3bf automatic code sync mgt, comment only 2018-08-06 15:40:21 -04:00
Gennadiy Civil 539ee4bc54 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
Gennadiy Civil ed1edf641d Formatting changes, code sync 2018-07-25 10:24:13 -04:00
Gennadiy Civil a02af2f689 code merge 2018-07-20 11:28:58 -04:00
Gennadiy Civil 0c17888bcf code sync 2018-07-19 12:42:39 -04:00
Gennadiy Civil 3530ab9e43 Code sync 2018-07-18 11:51:14 -04:00
Gennadiy Civil 8d07cfd053 Code sync, mostly formatting and removing outdates 2018-07-18 11:30:36 -04:00
Adrian Moran cbd07191f4 Put ifdef guard after the includes.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-13 08:53:03 +02:00
Adrian Moran 0acdf79642 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 93bfdde0ee Fix issue #1654.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-11 14:59:01 +02:00
Gennadiy Civil 8977af0ecf formatting changes 2018-05-23 11:49:11 -04:00
Gennadiy Civil 28c91e2cea Formatting changes 2018-05-23 11:03:31 -04:00
Scott Graham a9653c401e 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 9af3793103 merged 2018-04-25 13:16:19 -04:00
Gennadiy Civil b539167cf0 merging, 2018-04-25 13:10:41 -04:00
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