Commit Graph
415 Commits
Author SHA1 Message Date
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 691e38e518 More merges 2018-03-21 16:31:31 -04: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
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 cf9d6344d2 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil e891900666 Merging, XML tests 2018-03-07 15:57:55 -05:00
Gennadiy Civil 89d6f70f34 merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil 995a9dfa69 merges-7 2018-03-05 15:21:48 -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
Gennadiy Civil a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil 0d5e01ad7b Merges-1 2018-03-05 12:26:15 -05:00
Petr Hosek 7a2050d4d7 Use a full message in the JSON output for failures
The full message unlike summary also includes stack trace.
2018-03-01 13:19:34 -08:00
Gennadiy Civil 3817871beb Merge branch 'master' into json 2018-02-28 14:39:17 -05:00
Gennadiy Civil 66d71756a7 Merge branch 'master' into debug-postfix 2018-02-28 08:43:57 -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
Gennadiy Civil ce61dc54a2 Merge pull request #1423 from pcc/win-libcxx2
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
2018-02-27 14:00:29 -05:00
Gennadiy Civil ab46d9550b Merge branch 'master' into debug-postfix 2018-02-27 13:19:35 -05: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 d4f77c1e3a Merge branch 'master' into win-libcxx2 2018-02-27 10:00:29 -05:00
David Neto 20074be19a Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX
CMAKE_DEBUG_POSTFIX is a global configuration parameter, and
changing it pollutes the configuration space for other projects
that enclose this project.

DEBUG_POSTFIX is better to use since it is a target-specific poperty.

Fixes #1334
Fixes #1268
2018-02-26 15:58:49 -05:00
Gennadiy Civil aa31660d18 Merge branch 'master' into master 2018-02-26 11:14:34 -05: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
Anders Sundman (asum) 11e1dd257b Removed trailing comma in enum 2018-02-23 14:55:24 +01:00
Aleksey Kozin 99bb4fe85a Merge branch 'master' into patch-1 2018-02-23 01:38:54 +03:00
Aleksey Kozin 06568301ec TEST() arguments are invalid in an example
Both names must be valid C++ identifiers, and they should not contain underscore (`_`)
2018-02-23 01:34:26 +03:00
Gennadiy Civil ac138b6885 Merge branch 'master' into fix-death-warn 2018-02-22 16:34:27 -05:00
Gennadiy Civil 32e62da22a Merge pull request #1469 from gennadiycivil/master
merges
2018-02-22 16:09:17 -05:00
Gennadiy Civil df65632489 merges 2018-02-22 15:53:14 -05:00
Victor Costan 8a6158717b Fix unused function warning on Mac OS.
As of recently, Google Test fails to compile with the warning below when
used in projects with strict warning settings.

googletest/src/gtest-death-test.cc:1004:13: error: unused function 'StackGrowsDown' [-Werror,-Wunused-function]
2018-02-19 02:02:59 -08:00
Gennadiy Civil 8dd1eb5984 Merge branch 'master' into fix-printers 2018-02-15 15:41:39 -05:00
Gennadiy Civil a3e322b24f cleanup, merges 2018-02-13 15:25:57 -05:00
Gennadiy Civil 823f139bc7 Merge branch 'master' into fix-printers 2018-02-13 15:00:07 -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