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

1666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gennadiy Civil
851bd65ed9 Merge pull request #1503 from sheepmaster/upstream_188748737 
Allow macros inside of parametrized test names.
 2018-03-12 15:04:50 -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
f0dceabdaf Merge pull request #1502 from gennadiycivil/master 
merges-port(1)
 2018-03-12 12:39:13 -04:00
Gennadiy Civil
2cb5677ab7 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil
8526762ad7 Merge pull request #1497 from gennadiycivil/master 
Merging, XML tests
 2018-03-07 16:14:48 -05:00
Gennadiy Civil
744688e8bc Merging, XML tests 2018-03-07 15:57:55 -05:00
Gennadiy Civil
688fe905ba Merge pull request #1493 from gennadiycivil/master 
merges-8
 2018-03-05 16:15:02 -05:00
Gennadiy Civil
7ee36bdbea merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil
245e612f06 Merge pull request #1492 from gennadiycivil/master 
merges-7
 2018-03-05 15:52:38 -05:00
Gennadiy Civil
23d6041c40 merges-7 2018-03-05 15:21:48 -05:00
Gennadiy Civil
d8c84a22f2 Merge pull request #1491 from gennadiycivil/master 
merges-6
 2018-03-05 14:41:37 -05:00
Gennadiy Civil
b39f4ff8d0 merges-6 2018-03-05 14:21:41 -05:00
Gennadiy Civil
ae1dc48dcc Merge pull request #1490 from gennadiycivil/master 
merges-4
 2018-03-05 14:17:40 -05:00
Gennadiy Civil
fa282e44a3 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 13:59:08 -05:00
Gennadiy Civil
193af9ad36 merges-3 2018-03-05 13:51:39 -05:00
Gennadiy Civil
f8f7a33206 Merge pull request #1489 from gennadiycivil/master 
Merges-2
 2018-03-05 13:51:15 -05:00
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
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