888 Commits

Author SHA1 Message Date
Roland Leißa
8f7e029803 Merge branch 'master' into int3 2018-03-30 03:16:20 +02:00
Gennadiy Civil
73996ca508 Revert "merging gtest-port 1 of N" 2018-03-29 13:28:29 -04:00
Gennadiy Civil
148ec8fb4e Revert "merging gtest-port, 2" 2018-03-29 13:27:11 -04:00
Roland Leißa
6eed4f687b Merge remote-tracking branch 'google/master' into int3 2018-03-29 16:39:40 +02:00
Roland Leißa
4581b9eb35 typo 2018-03-29 16:38:23 +02:00
Gennadiy Civil
be841c6ed1 merging gtest-port, 2 2018-03-29 09:46:13 -04:00
Roland Leißa
d0c03cc388 provide alternative for DebugBreak()
This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
2018-03-28 23:45:51 +02:00
Gennadiy Civil
a81411ca4d merging gtest-port 1 of N 2018-03-27 15:19:40 -04:00
Gennadiy Civil
09e4f71b65 merges 1 2018-03-26 13:14:00 -04:00
Gennadiy Civil
b7e7102bb3 merges, gtest 2018-03-26 13:04:28 -04:00
Gennadiy Civil
685635069f reverting gtest_list_tests_unittest.py 2018-03-22 12:37:38 -04:00
Gennadiy Civil
d12860c513 more merges 2018-03-22 10:58:18 -04:00
Gennadiy Civil
8dcfeca51f more merges 2018-03-22 10:56:35 -04:00
Gennadiy Civil
bc73e93ea5 More merges 2018-03-21 16:31:31 -04:00
Gennadiy Civil
dd2cc36420 cl 189032107, again 2018-03-16 15:56:31 -04:00
Gennadiy Civil
67efdc1fc7 cl 189032107 2018-03-16 13:36:36 -04:00
Gennadiy Civil
78eb71c7e3 merge, again, IsRecursiveContainer 2018-03-15 14:31:37 -04:00
Gennadiy Civil
ab8042e409 erging, cont 2018-03-14 10:49:18 -04:00
Gennadiy Civil
5c87ce09b5 merging, merging 2018-03-13 16:02:05 -04:00
Gennadiy Civil
6aaae39fdc fixing, was removing too much 2018-03-13 11:53:27 -04:00
Gennadiy Civil
033c81bd1f Merge branch 'master' of https://github.com/google/googletest 2018-03-13 11:13:58 -04:00
Gennadiy Civil
92be48af66 More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Bernhard Bauer
77965a7da1 Merge branch 'master' into upstream_188748737 2018-03-12 18:15:35 +00:00
Bernhard Bauer
cb2dd89007 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
2cb5677ab7 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil
744688e8bc Merging, XML tests 2018-03-07 15:57:55 -05:00
Gennadiy Civil
7ee36bdbea merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil
23d6041c40 merges-7 2018-03-05 15:21:48 -05:00
Gennadiy Civil
b39f4ff8d0 merges-6 2018-03-05 14:21:41 -05:00
Gennadiy Civil
193af9ad36 merges-3 2018-03-05 13:51:39 -05:00
Gennadiy Civil
0a27876dd3 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil
78797f38ef Merges-1 2018-03-05 12:26:15 -05:00
Tanzinul Islam
2bb4a28def Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-03-05 02:25:59 +00:00
Petr Hosek
1c8ca09f01 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
66a9a65a50 Merge branch 'master' into json 2018-02-28 14:39:17 -05:00
Gennadiy Civil
2a94665b0b Merge branch 'master' into debug-postfix 2018-02-28 08:43:57 -05:00
Petr Hosek
e95050f496 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
80cd2a3c67 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
59589ecfe3 Merge branch 'master' into debug-postfix 2018-02-27 13:19:35 -05:00
Victor Costan
8921d82a1c 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
ec7faa943d

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
37cc7fb79a Merge branch 'master' into win-libcxx2 2018-02-27 10:00:29 -05:00
David Neto
12243d083a 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
f735c9f6fa Merge branch 'master' into master 2018-02-26 11:14:34 -05:00
Gennadiy Civil
5fd9cb3a67 merging unittests - 5 2018-02-26 09:51:27 -05:00
Gennadiy Civil
aac61e939e merging unitests - check 4 2018-02-23 15:27:11 -05:00
Gennadiy Civil
026c7e4c8f merging unitests, check 2018-02-23 11:29:35 -05:00
Gennadiy Civil
05e1ffc031 merging unittests - 2 2018-02-23 11:07:18 -05:00
Gennadiy Civil
227b345566 merging unitests 2018-02-23 10:47:11 -05:00
Anders Sundman (asum)
8d0e9cade8 Removed trailing comma in enum 2018-02-23 14:55:24 +01:00
Aleksey Kozin
2d2b94f785 Merge branch 'master' into patch-1 2018-02-23 01:38:54 +03:00