Commit Graph

2240 Commits

Author SHA1 Message Date
Gennadiy Civil
f66ab00704 Upstream, cl/199129756
Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616
2018-06-04 10:45:56 -04:00
Gennadiy Civil
db5f9ec567
Merge pull request #1608 from gennadiycivil/master
formatting changes
2018-06-01 10:19:07 +02:00
Fabrice de Gans-Riberi
93e267a999 Clean up 2018-05-31 11:21:01 -07:00
Fabrice de Gans-Riberi
0a6edf3ca7 Remvoe launchpad dependency from Fuchsia. 2018-05-30 18:17:35 -07:00
Gennadiy Civil
8977af0ecf formatting changes 2018-05-23 11:49:11 -04:00
Gennadiy Civil
4e4df226fc
Merge pull request #1607 from gennadiycivil/master
Formatting changes
2018-05-23 08:15:50 -07:00
Gennadiy Civil
28c91e2cea Formatting changes 2018-05-23 11:03:31 -04:00
Gennadiy Civil
145d05750b
Merge pull request #1603 from Steelskin/unused-variable-fuchsia
Remove unused variable in Fuchsia.
2018-05-22 06:31:53 -07:00
Gennadiy Civil
32c84be0fc
Merge branch 'master' into unused-variable-fuchsia 2018-05-22 06:01:05 -07:00
Gennadiy Civil
8276dbae6f
Merge pull request #1591 from sgraham/disabled-rtti
Fix gmock not building when -fno-rtti
2018-05-22 06:00:40 -07:00
Gennadiy Civil
3b22e21cc8
Merge branch 'master' into disabled-rtti 2018-05-22 05:34:05 -07:00
Gennadiy Civil
1814bed8ec
Merge pull request #1601 from jdennett/StdLibVersioning
Std lib versioning
2018-05-22 05:32:53 -07:00
James Dennett
49ecebd1f2
Downgrade to C++98.
Some projects cannot handle C++11 yet.
2018-05-21 12:27:52 -07:00
James Dennett
ec2c911b33
Downgrade to C++98 code.
Some users are not ready for C++11 yet.
2018-05-21 10:59:24 -07:00
James Dennett
89286a4cdf
Merge branch 'master' into StdLibVersioning 2018-05-21 10:57:01 -07:00
Tanzinul Islam
3280099951 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-05-13 11:42:21 +01:00
Fabrice de Gans-Riberi
f91bf75cf9 Remove unused variable in Fuchsia. 2018-05-11 10:38:48 -07:00
Scott Graham
9db942a6b7
Merge branch 'master' into disabled-rtti 2018-05-11 09:57:44 -07:00
Gennadiy Civil
08d5b1f33a
Merge pull request #1597 from jaeheonlee/master
Fix a bug with ad_hoc_test_result() functions of UnitTest and TestCase classes
2018-05-11 09:05:24 -04:00
James Dennett
54e331b88b
Add support for versioned standard libraries.
This canonicalizes demangled names by omitting a nested inline namespace within namespace std if the name of the nested namespace begins with a double underscore.  This improves compatibility with libc++.
2018-05-10 22:39:19 -07:00
James Dennett
fc66ae45fc
Update generated code. 2018-05-10 22:36:50 -07:00
James Dennett
b8fa4d2754
Add unit test for CanonicalizeForStdLibVersioning. 2018-05-10 22:33:29 -07:00
Jae Heon Lee
18abd8f512 Use NULL instead of nullptr, for pre-C++11 builds. 2018-05-09 13:03:57 -07:00
Jae Heon Lee
ec5ad0f869 Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively. 2018-05-07 14:09:37 -07:00
Gennadiy Civil
045e7f9ee4
Merge pull request #1593 from Steelskin/fuchsia_death_test
Add death test support for Fuchsia.
2018-05-07 14:43:09 -04:00
Tanzinul Islam
10f05a627c Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-05-05 19:53:33 +01:00
Fabrice de Gans-Riberi
960149f913 Remove magic number 2018-05-03 13:57:51 -07:00
Fabrice de Gans-Riberi
242f0f623c Style fix 2018-05-03 13:44:42 -07:00
Fabrice de Gans-Riberi
8497540f39 Fix comments 2018-05-03 13:42:31 -07:00
Fabrice de Gans-Riberi
13af91faff Fix more stuff and get tests to pass 2018-05-03 12:06:45 -07:00
Fabrice de Gans-Riberi
96c3c422ad Get all the things to work. 2018-05-02 14:57:56 -07:00
Scott Graham
a9653c401e Fix gmock not building when -fno-rtti
Fixes issue #1554. This is internal cl/195020996.
2018-05-02 11:14:39 -07:00
Fabrice de Gans-Riberi
b6cb5c3e40 Fix stuff 2018-05-01 18:43:55 -07:00
Fabrice de Gans-Riberi
d4b5281d11 Add Fuchsia support for death test. 2018-05-01 16:22:09 -07:00
Gennadiy Civil
278aba369c
Merge pull request #1589 from sgraham/rtti-build
Add no-exception and no-rtti to build matrix
2018-05-01 13:07:29 -04:00
Scott Graham
95ec42d95f Add no-exception and no-rtti to build matrix 2018-05-01 09:34:13 -07:00
Gennadiy Civil
dc043e1ca6
Merge pull request #1588 from gennadiycivil/master
mostly 193547722
2018-04-25 13:28:20 -04:00
Gennadiy Civil
9af3793103 merged 2018-04-25 13:16:19 -04:00
Gennadiy Civil
b539167cf0 merging, 2018-04-25 13:10:41 -04:00
Gennadiy Civil
a6f06bf2fd
Merge pull request #1582 from dnsunderland/parameterless
Introduce parameterless expectations
2018-04-19 18:44:01 -04:00
Gennadiy Civil
884bcdaf18
Merge branch 'master' into parameterless 2018-04-19 18:35:17 -04:00
Gennadiy Civil
1114a0202a
Merge pull request #1580 from gennadiycivil/master
merging
2018-04-19 11:57:52 -04:00
Gennadiy Civil
bb7a018348 reverting, test 2018-04-19 11:28:46 -04:00
Gennadiy Civil
7b4ee66f5f reverting just to test 2018-04-19 11:14:17 -04:00
Gennadiy Civil
62a7c140a7 testing 2018-04-19 10:19:59 -04:00
David Sunderland
2d3024f5bd Fix friend declaration to use GTEST_API_ decl spec. 2018-04-19 01:11:50 -04:00
David Sunderland
b2f97ab317 Revert useless use of GTEST_API_ on WithoutMatchers decl. 2018-04-19 01:10:22 -04:00
David Sunderland
1c79ad7a56 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC? 2018-04-18 20:59:49 -04:00
David Sunderland
d5725da968 Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. 2018-04-18 20:25:31 -04:00
David Sunderland
7878b27ddd Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless 2018-04-18 19:39:39 -04:00