summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-05-1310-22/+273
|\
| * Merge pull request #1597 from jaeheonlee/masterGennadiy Civil2018-05-112-4/+30
| |\ | | | | | | Fix a bug with ad_hoc_test_result() functions of UnitTest and TestCase classes
| | * Use NULL instead of nullptr, for pre-C++11 builds.refs/pull/1597/headJae Heon Lee2018-05-091-2/+2
| | |
| | * Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase ↵Jae Heon Lee2018-05-072-4/+30
| |/ | | | | | | objects would return failures registered at TestCase and UnitTest scopes, respectively.
| * Merge pull request #1593 from Steelskin/fuchsia_death_testGennadiy Civil2018-05-078-18/+243
| |\ | | | | | | Add death test support for Fuchsia.
| | * Remove magic numberrefs/pull/1593/headFabrice de Gans-Riberi2018-05-031-1/+1
| | |
| | * Style fixFabrice de Gans-Riberi2018-05-031-1/+1
| | |
| | * Fix commentsFabrice de Gans-Riberi2018-05-032-6/+6
| | |
| | * Fix more stuff and get tests to passFabrice de Gans-Riberi2018-05-036-14/+35
| | |
| | * Get all the things to work.Fabrice de Gans-Riberi2018-05-021-35/+45
| | |
| | * Fix stuffFabrice de Gans-Riberi2018-05-021-29/+27
| | |
| | * Add Fuchsia support for death test.Fabrice de Gans-Riberi2018-05-014-4/+200
| |/
* | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-05-0537-1309/+3875
|\ \ | |/
| * Merge pull request #1589 from sgraham/rtti-buildGennadiy Civil2018-05-012-0/+11
| |\ | | | | | | Add no-exception and no-rtti to build matrix
| | * Add no-exception and no-rtti to build matrixrefs/pull/1589/headScott Graham2018-05-012-0/+11
| |/
| * Merge pull request #1588 from gennadiycivil/masterGennadiy Civil2018-04-254-597/+619
| |\ | | | | | | mostly 193547722
| | * mergedrefs/pull/1588/headGennadiy Civil2018-04-251-1/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1582 from dnsunderland/parameterlessGennadiy Civil2018-04-197-13/+426
| |\ \ | | | | | | | | Introduce parameterless expectations
| | * \ Merge branch 'master' into parameterlessrefs/pull/1582/headGennadiy Civil2018-04-191-112/+93
| | |\ \ | | |/ / | |/| |
| | * | Fix friend declaration to use GTEST_API_ decl spec.David Sunderland2018-04-191-1/+1
| | | |
| | * | Revert useless use of GTEST_API_ on WithoutMatchers decl.David Sunderland2018-04-191-1/+1
| | | |
| | * | Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the ↵David Sunderland2018-04-191-1/+1
| | | | | | | | | | | | | | | | problem on MSVC?
| | * | Mark new GetWithoutMatchers method as part of the exported API, to address ↵David Sunderland2018-04-192-2/+2
| | | | | | | | | | | | | | | | MSVC linker errors.
| | * | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest ↵David Sunderland2018-04-185-270/+438
| | |\ \ | | | | | | | | | | | | | | | into parameterless
| | | * \ Merge branch 'master' into parameterlessdnsunderland2018-04-185-270/+438
| | | |\ \
| | * | | | Don't use generalized initializer list; is C++11 extension.David Sunderland2018-04-181-1/+1
| | |/ / /
| | * | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-187-13/+426
| | | | |
| | | | * merging, Gennadiy Civil2018-04-258-493/+929
| | |_|/ | |/| |
| * | | Merge pull request #1580 from gennadiycivil/masterGennadiy Civil2018-04-191-112/+93
| |\ \ \ | | |_|/ | |/| | merging
| | * | reverting, testrefs/pull/1580/headGennadiy Civil2018-04-191-13/+3
| | | |
| | * | reverting just to test Gennadiy Civil2018-04-191-1/+1
| | | |
| | * | testingGennadiy Civil2018-04-191-12/+12
| | | |
| | * | more typosGennadiy Civil2018-04-181-1/+1
| | | |
| | * | msvcGennadiy Civil2018-04-181-8/+6
| | | |
| | * | more typosGennadiy Civil2018-04-181-3/+2
| | | |
| | * | typoGennadiy Civil2018-04-181-7/+7
| | | |
| | * | move only types docsGennadiy Civil2018-04-181-112/+93
| | | |
| | * | typoGennadiy Civil2018-04-181-0/+4
| | | |
| | * | typoGennadiy Civil2018-04-181-1/+1
| | | |
| | * | http://cl/193386206Gennadiy Civil2018-04-181-0/+9
| | | |
| | * | Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-180-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1579 from gennadiycivil/masterGennadiy Civil2018-04-182-4/+16
| |\ \ \ | | | | | | | | | | 193353312
| | | * | merge, explicit, ( should be it)Gennadiy Civil2018-04-181-1/+1
| | |/ /
| | * | Merge branch 'master' of github.com:google/googletestrefs/pull/1579/headGennadiy Civil2018-04-180-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1577 from gennadiycivil/masterGennadiy Civil2018-04-175-270/+426
| |\ \ \ | | |_|/ | |/| | merging gmock generated matchers
| | | * 193353312Gennadiy Civil2018-04-182-4/+16
| | |/
| | * cl/193060888refs/pull/1577/headGennadiy Civil2018-04-171-3/+3
| | |
| | * http://cl/193060888Gennadiy Civil2018-04-171-30/+6
| | |
| | * http://cl/193060888Gennadiy Civil2018-04-172-5/+55
| | |
| | * test-meergingGennadiy Civil2018-04-162-34/+6
| | |