eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,632 Commits 13 Branches 14 Tags 23 MiB
0d5e01ad7b
Commit Graph

1632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
0d5e01ad7b Merges-1 2018-03-05 12:26:15 -05:00
Gennadiy Civil
447d58b4ee
Merge pull request #1485 from coryan/parallelize-appveyor 
Add options to parallelize builds.
 2018-02-28 15:23:40 -05:00
Gennadiy Civil
18d270e335
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
3817871beb
Merge branch 'master' into json 2018-02-28 14:39:17 -05:00
Carlos O'Ryan
3431b69909
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
9557d29b7a
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
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
fe1144246e
Merge pull request #1482 from zhangxy988/variant_matcher 
Add matcher for std::variant.
 2018-02-27 16:58:28 -05:00
Xiaoyi Zhang
e1622337ae Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher 2018-02-27 16:06:07 -05:00
Xiaoyi Zhang
576d689c19
Merge branch 'master' into variant_matcher 2018-02-27 16:03:36 -05:00
Xiaoyi Zhang
62be6f34d1 Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher 2018-02-27 16:01:14 -05:00
Xiaoyi Zhang
2eb31c185c Add documentation for VariantWith. 2018-02-27 16:00:42 -05:00
Gennadiy Civil
a9f2368dc0
Merge pull request #1483 from gennadiycivil/master 
gmock merging -2
 2018-02-27 14:39:41 -05:00
Gennadiy Civil
ba40fd1456
Merge branch 'master' into master 2018-02-27 14:10:27 -05: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
2bd1750ba7 gmock merging -2 2018-02-27 13:51:09 -05:00
Gennadiy Civil
ab46d9550b
Merge branch 'master' into debug-postfix 2018-02-27 13:19:35 -05:00
Gennadiy Civil
b951c652ff
Merge branch 'master' into variant_matcher 2018-02-27 13:18:55 -05:00
Gennadiy Civil
7d15497f75
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
190e2cdd0b Add matcher for std::variant. 2018-02-27 11:36:21 -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
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
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
ac34e6c950
Merge pull request #1472 from AndersSundmanTobii/master 
Removed trailing comma in enum
 2018-02-26 11:27:28 -05:00
Gennadiy Civil
aa31660d18
Merge branch 'master' into master 2018-02-26 11:14:34 -05:00
Gennadiy Civil
1d324d8491
Merge pull request #1475 from gennadiycivil/master 
merge check - 3
 2018-02-26 10:10:58 -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
194c99b942 Merge branch 'master' of https://github.com/google/googletest 2018-02-23 11:51:40 -05:00
Gennadiy Civil
3a4cf1a02e
Merge pull request #1474 from gennadiycivil/master 
merging unittests - 2
 2018-02-23 11:51:30 -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
c0563458ee
Merge pull request #1473 from gennadiycivil/master 
merging unitests
 2018-02-23 11:02:53 -05:00
Gennadiy Civil
b7e0294c51 merging unitests 2018-02-23 10:47:11 -05:00
Gennadiy Civil
70e1aad72c
Merge pull request #1471 from aleksejkozin/patch-1 
TEST() arguments are invalid in an example
 2018-02-23 10:17:05 -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
Gennadiy Civil
a490fb7a9a
Merge pull request #1466 from pwnall/fix-death-warn 
Fix unused function warning on Mac OS.
 2018-02-22 17:37:41 -05: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
3f0cf6b62a
Merge pull request #1450 from pwnall/fix-printers 
Fix std::iscntrl use in gtest-printers.cc
 2018-02-15 17:24:19 -05:00
Gennadiy Civil
8dd1eb5984
Merge branch 'master' into fix-printers 2018-02-15 15:41:39 -05:00
Gennadiy Civil
42140509b6
Merge pull request #1459 from gennadiycivil/master 
cleanup, merges
 2018-02-13 16:04:47 -05:00
Gennadiy Civil
8248169287 Merge branch 'master' of https://github.com/google/googletest 2018-02-13 15:26:07 -05:00
Gennadiy Civil
a3e322b24f cleanup, merges 2018-02-13 15:25:57 -05:00
Gennadiy Civil
0d6a674f61
Merge pull request #1458 from gennadiycivil/master 
cleanup, merges
 2018-02-13 15:24:31 -05:00