Gennadiy Civil
28c91e2cea
Formatting changes
2018-05-23 11:03:31 -04:00
James Dennett
89286a4cdf
Merge branch 'master' into StdLibVersioning
2018-05-21 10:57:01 -07:00
James Dennett
b8fa4d2754
Add unit test for CanonicalizeForStdLibVersioning.
2018-05-10 22:33:29 -07:00
Jae Heon Lee
ec5ad0f869
Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively.
2018-05-07 14:09:37 -07:00
Fabrice de Gans-Riberi
13af91faff
Fix more stuff and get tests to pass
2018-05-03 12:06:45 -07:00
Gennadiy Civil
c13ab6003b
merging
2018-04-11 13:20:36 -04:00
Gennadiy Civil
d52aaee8eb
Upstreaming, cl 191344765
2018-04-03 16:14:35 -04:00
Gennadiy Civil
3df7cbe6f7
merges, gtest
2018-03-26 13:04:28 -04:00
Gennadiy Civil
4e89c76db8
reverting gtest_list_tests_unittest.py
2018-03-22 12:37:38 -04:00
Gennadiy Civil
da71e8c870
more merges
2018-03-22 10:58:18 -04:00
Gennadiy Civil
0f6567954f
more merges
2018-03-22 10:56:35 -04:00
Gennadiy Civil
a3c2e107ae
cl 189032107, again
2018-03-16 15:56:31 -04:00
Gennadiy Civil
a178cc7ef7
merge, again, IsRecursiveContainer
2018-03-15 14:31:37 -04:00
Gennadiy Civil
262aaf2f1d
erging, cont
2018-03-14 10:49:18 -04:00
Gennadiy Civil
2814b4b089
merging, merging
2018-03-13 16:02:05 -04:00
Gennadiy Civil
a719320a3c
fixing, was removing too much
2018-03-13 11:53:27 -04:00
Gennadiy Civil
5461f63d01
Merge branch 'master' of https://github.com/google/googletest
2018-03-13 11:13:58 -04:00
Gennadiy Civil
af463c43ac
More merges, removing old dead code
2018-03-13 11:13: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
Gennadiy Civil
e891900666
Merging, XML tests
2018-03-07 15:57:55 -05:00
Gennadiy Civil
086825de5d
merges-6
2018-03-05 14:21:41 -05:00
Gennadiy Civil
8385928428
merges-3
2018-03-05 13:51:39 -05:00
Petr Hosek
6baf17e9d1
Support JSON output format in addition to XML
...
This change allows emitting output in JSON format in addition to the
already supported XML format. The implementation as well as the file
structure is intentionally modelled after the XML one.
2018-02-28 00:48:41 -08:00
Victor Costan
84ec2e0365
Switch default death test style back to "fast".
...
Google Test has recently (02/09/2018) switched the default death test
style from "fast" to "threadsafe" in
https://github.com/google/googletest/commit/ec7faa943d7817c81ce7bdf71a21ebc9244dc8de
Threadsafe death tests have been used internally for a while, and are
proven to be a better default.
However, adopting this better default can be challenging for large
projects with a significant investment in custom infrastructure built on
top of Google Test. The same custom infrastructure can make it difficult
for large projects to switch back to the old default by passing in
--gtest_death_test_style=fast.
For the reasons above, the default switch is considered too disruptive,
and this CL reverts it. This CL also introduces the
GTEST_DEFAULT_DEATH_TEST_STYLE preprocesor macro, which replaces the
hard-coded default. The macro can be defined in
gtest/internal/custom/gtest-port.h by projects that are ready to migrate
to thread-safe death tests.
2018-02-27 07:50:03 -08:00
Gennadiy Civil
4dbb437174
merging unittests - 5
2018-02-26 09:51:27 -05:00
Gennadiy Civil
004f6a00b2
merging unitests - check 4
2018-02-23 15:27:11 -05:00
Gennadiy Civil
29e9ca8774
merging unitests, check
2018-02-23 11:29:35 -05:00
Gennadiy Civil
3299a2386c
merging unittests - 2
2018-02-23 11:07:18 -05:00
Gennadiy Civil
b7e0294c51
merging unitests
2018-02-23 10:47:11 -05:00
Gennadiy Civil
df65632489
merges
2018-02-22 15:53:14 -05:00
Gennadiy Civil
09581b3852
cleanup/merges
2018-02-13 14:56:05 -05:00
Gennadiy Civil
069724197c
merging, cleaning up
2018-02-13 14:13:52 -05:00
Gennadiy Civil
ab186a8c49
merges
2018-02-13 13:49:57 -05:00
Gennadiy Civil
30d276da03
cxxx11
2018-02-13 11:48:32 -05:00
Gennadiy Civil
3b1fe3ec45
clang warnings
2018-02-13 11:24:09 -05:00
Gennadiy Civil
d7c966c4de
clang warnings
2018-02-13 11:15:03 -05:00
Gennadiy Civil
2a23ca0009
https://travis-ci.org/google/googletest/jobs/340995238
2018-02-13 11:05:01 -05:00
Gennadiy Civil
a66d209061
clang warning ' https://travis-ci.org/google/googletest/jobs/340987201 '
2018-02-13 10:23:42 -05:00
Gennadiy Civil
e76f4ee9fd
clang warning https://travis-ci.org/google/googletest/jobs/340978022
2018-02-13 10:05:43 -05:00
Gennadiy Civil
9e072812e3
merges
2018-02-13 09:45:12 -05:00
Gennadiy Civil
d84f58ab10
Merging, coniniue
2018-02-12 14:07:45 -05:00
Gennadiy Civil
b324a36c35
Merge branch 'master' into assert
2018-02-09 11:42:05 -05:00
Gennadiy Civil
22a115055a
Merge pull request #1446 from tholsapp/master
...
Fixed typos
2018-02-09 11:34:26 -05:00
Gennadiy Civil
ec7faa943d
merges
2018-02-09 10:41:09 -05:00
Troy Holsapple
c8510504dd
Fixed typos
2018-02-07 22:06:00 -08:00
Alexey Sokolov
092d088533
Add ability to throw from ASSERT
...
while not losing benefits of EXPECT, and not killing the whole test,
as with --gtest_throw_on_failure.
183822976
2018-02-08 01:15:42 +00:00
Gennadiy Civil
e55fded0c8
Code merges
2018-01-30 17:34:22 -05:00
Gennadiy Civil
2a4683021a
Ability to optionally depend on Abseil plus upstream of 183716547
2018-01-30 11:42:03 -05:00
Gennadiy Civil
b9651c04ef
placating gcc and its overzeauls size comparison warnings
2018-01-24 16:06:08 -05:00
Gennadiy Civil