Gennadiy Civil
6f9db26159
merging
2018-04-10 16:34:21 -04:00
fo40225
a0c27bd8a5
fix build break on locale windows
2018-04-04 23:16:16 +08:00
Gennadiy Civil
a3c2e107ae
cl 189032107, again
2018-03-16 15:56:31 -04:00
Gennadiy Civil
080fcbe0aa
cl 189032107
2018-03-16 13:36:36 -04:00
Gennadiy Civil
a178cc7ef7
merge, again, IsRecursiveContainer
2018-03-15 14:31:37 -04:00
Bernhard Bauer
fc437ef4b2
Merge branch 'master' into upstream_188748737
2018-03-12 18:15:35 +00:00
Bernhard Bauer
7b70413e0c
Allow macros inside of parametrized test names.
...
This allows doing things like TEST_P(TestFixture, MAYBE(TestName))
for nicer conditional test disabling.
Upstream of cr/188748737.
Tested:
Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
2018-03-12 18:14:06 +00:00
Anders Sundman (asum)
11e1dd257b
Removed trailing comma in enum
2018-02-23 14:55:24 +01:00
Gennadiy Civil
a3e322b24f
cleanup, merges
2018-02-13 15:25:57 -05:00
Fedor Trushkin
9c82e7745c
Expose ScopedTrace utility in public interface
2018-01-17 16:41:59 +01:00
Gennadiy Civil
93b77987f5
continue upstream/merge, etc
2018-01-11 17:36:34 -05:00
Gennadiy Civil
6914ae2394
Upstream cl 103120214
2018-01-11 11:31:23 -05:00
Gennadiy Civil
62dbaa2947
revert
2018-01-10 14:00:52 -05:00
Gennadiy Civil
d630a8bdac
code merges, cleanup
2018-01-10 13:58:00 -05:00
drgler
71ca4bae10
Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521 : Add is_same type trait and prevent infinite loops for recursive containers
2017-08-09 19:08:22 +02:00
Billy Donahue
c2d90bddc6
Create gtest-internal.h
2017-06-11 18:34:04 -04:00
Nico Weber
09fd5b3ebf
Use std::string and ::string explicitly in gtest and gmock code.
...
This merges a Google-internal change (117235625).
Original CL description:
This CL was created manually in about an hour with sed, a Python script
to find all the places unqualified 'string' was mentioned, and some help
from Emacs to add the "std::" qualifications, plus a few manual tweaks.
2017-05-15 17:53:04 -04:00
Billy Donahue
1f87a0970d
Move everything in googletest into googletest/googletest
2015-08-25 16:18:00 -04:00
