GitLab

merges-6

merges-6

merges-4

Merges-2

merges-2

Merges

Try to handle unsigned wchar_t (arm) a bit better

Use a full message in the JSON output for failures

The full message unlike summary also includes stack trace.

Add options to parallelize builds.

Support JSON output format in addition to XML

AppVeyor build servers have two cores, so why not use them?

Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX

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.

Add matcher for std::variant.

gmock merging -2

Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.

Add preprocessor macro for default death test style.

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.

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