eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,963 Commits 13 Branches 14 Tags
Commit Graph

2963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
012b1c2d1a Merge branch 'master' of https://github.com/google/googletest 2018-03-05 13:28:17 -05:00
Gennadiy Civil
ffd5d36f59 merges-2 2018-03-05 13:28:13 -05:00
Gennadiy Civil
07251ce589 Merge pull request #1488 from gennadiycivil/master 
Merges
 2018-03-05 13:21:59 -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
Gennadiy Civil
e2484005b1 Merge pull request #1477 from sgraham/unsigned-wchar 
Try to handle unsigned wchar_t (arm) a bit better
 2018-03-05 11:03:08 -05:00
Gennadiy Civil
6e70776dc8 Merge branch 'master' into unsigned-wchar 2018-03-05 10:43:19 -05:00
Tanzinul Islam
f7bcb57fa7 Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116 2018-03-05 09:02:59 +00:00
Tanzinul Islam
2bb4a28def Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-03-05 02:25:59 +00:00
Gennadiy Civil
98b034261d Merge pull request #1486 from petrhosek/json-stacktrace 
Use a full message in the JSON output for failures
 2018-03-02 14:32:06 -05: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
6e32061e10 Merge branch 'master' into unsigned-wchar 2018-03-01 11:18:17 -05:00
Gennadiy Civil
d30d3c7ec3 Merge pull request #1485 from coryan/parallelize-appveyor 
Add options to parallelize builds.
 2018-02-28 15:23:40 -05:00
Gennadiy Civil
ec76df5e26 Merge pull request #1479 from petrhosek/json 
Support JSON output format in addition to XML
 2018-02-28 14:50:35 -05:00
Gennadiy Civil
66a9a65a50 Merge branch 'master' into json 2018-02-28 14:39:17 -05:00
Carlos O'Ryan
ed90bec311 Add options to parallelize builds. 
AppVeyor build servers have two cores, so why not use them?
 2018-02-28 11:28:57 -05:00
Gennadiy Civil
0d0d5826cd Merge pull request #1481 from dneto0/debug-postfix 
Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX
 2018-02-28 08:55:39 -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
4a3723f75b Merge pull request #1482 from zhangxy988/variant_matcher 
Add matcher for std::variant.
 2018-02-27 16:58:28 -05:00
Xiaoyi Zhang
5ed069a8fd Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher 2018-02-27 16:06:07 -05:00
Xiaoyi Zhang
94075ff9c0 Merge branch 'master' into variant_matcher 2018-02-27 16:03:36 -05:00
Xiaoyi Zhang
fe1c9d6dd7 Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher 2018-02-27 16:01:14 -05:00
Xiaoyi Zhang
250d4e8066 Add documentation for VariantWith. 2018-02-27 16:00:42 -05:00
Gennadiy Civil
84d1ef9716 Merge pull request #1483 from gennadiycivil/master 
gmock merging -2
 2018-02-27 14:39:41 -05:00
Gennadiy Civil
437aa618e5 Merge branch 'master' into master 2018-02-27 14:10:27 -05: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
bcc0a1afa1 gmock merging -2 2018-02-27 13:51:09 -05:00
Gennadiy Civil
f6792fee4f Merge branch 'master' into unsigned-wchar 2018-02-27 13:19:57 -05:00
Gennadiy Civil
59589ecfe3 Merge branch 'master' into debug-postfix 2018-02-27 13:19:35 -05:00
Gennadiy Civil
9ec26eca25 Merge branch 'master' into variant_matcher 2018-02-27 13:18:55 -05:00
Gennadiy Civil
bb1a39beb6 Merge pull request #1464 from pwnall/death-style 
Add preprocessor macro for default death test style.
 2018-02-27 12:57:51 -05:00
Xiaoyi Zhang
fe8a4bec1b Add matcher for std::variant. 2018-02-27 11:36:21 -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
dce63bb4f5 Merge branch 'master' into unsigned-wchar 2018-02-26 12:08:48 -05:00
Gennadiy Civil
b7316299c6 Merge pull request #1472 from AndersSundmanTobii/master 
Removed trailing comma in enum
 2018-02-26 11:27:28 -05:00
Gennadiy Civil
f735c9f6fa Merge branch 'master' into master 2018-02-26 11:14:34 -05:00
Gennadiy Civil
39c337e416 Merge pull request #1475 from gennadiycivil/master 
merge check - 3
 2018-02-26 10:10:58 -05:00
Gennadiy Civil
5fd9cb3a67 merging unittests - 5 2018-02-26 09:51:27 -05:00
Scott Graham
7c60f81b22 Try to handle unsigned wchar_t (arm) a bit better 2018-02-23 12:28:09 -08:00
Gennadiy Civil
aac61e939e merging unitests - check 4 2018-02-23 15:27:11 -05:00
Gennadiy Civil
366ae2a30b Merge branch 'master' of https://github.com/google/googletest 2018-02-23 11:51:40 -05:00
Gennadiy Civil
29bfe9aeaf Merge pull request #1474 from gennadiycivil/master 
merging unittests - 2
 2018-02-23 11:51:30 -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
12c0806c22 Merge pull request #1473 from gennadiycivil/master 
merging unitests
 2018-02-23 11:02:53 -05:00
Gennadiy Civil
227b345566 merging unitests 2018-02-23 10:47:11 -05:00
Gennadiy Civil
cc04b87122 Merge pull request #1471 from aleksejkozin/patch-1 
TEST() arguments are invalid in an example
 2018-02-23 10:17:05 -05:00