Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 | Tanzinul Islam | 2018-05-13 | 10 | -22/+273 |
|\ | |||||
| * | Merge pull request #1597 from jaeheonlee/master | Gennadiy Civil | 2018-05-11 | 2 | -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/head | Jae Heon Lee | 2018-05-09 | 1 | -2/+2 |
| | | | |||||
| | * | Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase ↵ | Jae Heon Lee | 2018-05-07 | 2 | -4/+30 |
| |/ | | | | | | | objects would return failures registered at TestCase and UnitTest scopes, respectively. | ||||
| * | Merge pull request #1593 from Steelskin/fuchsia_death_test | Gennadiy Civil | 2018-05-07 | 8 | -18/+243 |
| |\ | | | | | | | Add death test support for Fuchsia. | ||||
| | * | Remove magic numberrefs/pull/1593/head | Fabrice de Gans-Riberi | 2018-05-03 | 1 | -1/+1 |
| | | | |||||
| | * | Style fix | Fabrice de Gans-Riberi | 2018-05-03 | 1 | -1/+1 |
| | | | |||||
| | * | Fix comments | Fabrice de Gans-Riberi | 2018-05-03 | 2 | -6/+6 |
| | | | |||||
| | * | Fix more stuff and get tests to pass | Fabrice de Gans-Riberi | 2018-05-03 | 6 | -14/+35 |
| | | | |||||
| | * | Get all the things to work. | Fabrice de Gans-Riberi | 2018-05-02 | 1 | -35/+45 |
| | | | |||||
| | * | Fix stuff | Fabrice de Gans-Riberi | 2018-05-02 | 1 | -29/+27 |
| | | | |||||
| | * | Add Fuchsia support for death test. | Fabrice de Gans-Riberi | 2018-05-01 | 4 | -4/+200 |
| |/ | |||||
* | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 | Tanzinul Islam | 2018-05-05 | 37 | -1309/+3875 |
|\ \ | |/ | |||||
| * | Merge pull request #1589 from sgraham/rtti-build | Gennadiy Civil | 2018-05-01 | 2 | -0/+11 |
| |\ | | | | | | | Add no-exception and no-rtti to build matrix | ||||
| | * | Add no-exception and no-rtti to build matrixrefs/pull/1589/head | Scott Graham | 2018-05-01 | 2 | -0/+11 |
| |/ | |||||
| * | Merge pull request #1588 from gennadiycivil/master | Gennadiy Civil | 2018-04-25 | 4 | -597/+619 |
| |\ | | | | | | | mostly 193547722 | ||||
| | * | mergedrefs/pull/1588/head | Gennadiy Civil | 2018-04-25 | 1 | -1/+0 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1582 from dnsunderland/parameterless | Gennadiy Civil | 2018-04-19 | 7 | -13/+426 |
| |\ \ | | | | | | | | | Introduce parameterless expectations | ||||
| | * \ | Merge branch 'master' into parameterlessrefs/pull/1582/head | Gennadiy Civil | 2018-04-19 | 1 | -112/+93 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Fix friend declaration to use GTEST_API_ decl spec. | David Sunderland | 2018-04-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert useless use of GTEST_API_ on WithoutMatchers decl. | David Sunderland | 2018-04-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the ↵ | David Sunderland | 2018-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | problem on MSVC? | ||||
| | * | | Mark new GetWithoutMatchers method as part of the exported API, to address ↵ | David Sunderland | 2018-04-19 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | MSVC linker errors. | ||||
| | * | | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest ↵ | David Sunderland | 2018-04-18 | 5 | -270/+438 |
| | |\ \ | | | | | | | | | | | | | | | | into parameterless | ||||
| | | * \ | Merge branch 'master' into parameterless | dnsunderland | 2018-04-18 | 5 | -270/+438 |
| | | |\ \ | |||||
| | * | | | | Don't use generalized initializer list; is C++11 extension. | David Sunderland | 2018-04-18 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations. | David Sunderland | 2018-04-18 | 7 | -13/+426 |
| | | | | | |||||
| | | | * | merging, | Gennadiy Civil | 2018-04-25 | 8 | -493/+929 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #1580 from gennadiycivil/master | Gennadiy Civil | 2018-04-19 | 1 | -112/+93 |
| |\ \ \ | | |_|/ | |/| | | merging | ||||
| | * | | reverting, testrefs/pull/1580/head | Gennadiy Civil | 2018-04-19 | 1 | -13/+3 |
| | | | | |||||
| | * | | reverting just to test | Gennadiy Civil | 2018-04-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | testing | Gennadiy Civil | 2018-04-19 | 1 | -12/+12 |
| | | | | |||||
| | * | | more typos | Gennadiy Civil | 2018-04-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | msvc | Gennadiy Civil | 2018-04-18 | 1 | -8/+6 |
| | | | | |||||
| | * | | more typos | Gennadiy Civil | 2018-04-18 | 1 | -3/+2 |
| | | | | |||||
| | * | | typo | Gennadiy Civil | 2018-04-18 | 1 | -7/+7 |
| | | | | |||||
| | * | | move only types docs | Gennadiy Civil | 2018-04-18 | 1 | -112/+93 |
| | | | | |||||
| | * | | typo | Gennadiy Civil | 2018-04-18 | 1 | -0/+4 |
| | | | | |||||
| | * | | typo | Gennadiy Civil | 2018-04-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | http://cl/193386206 | Gennadiy Civil | 2018-04-18 | 1 | -0/+9 |
| | | | | |||||
| | * | | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-18 | 0 | -0/+0 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1579 from gennadiycivil/master | Gennadiy Civil | 2018-04-18 | 2 | -4/+16 |
| |\ \ \ | | | | | | | | | | | 193353312 | ||||
| | | * | | merge, explicit, ( should be it) | Gennadiy Civil | 2018-04-18 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge branch 'master' of github.com:google/googletestrefs/pull/1579/head | Gennadiy Civil | 2018-04-18 | 0 | -0/+0 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1577 from gennadiycivil/master | Gennadiy Civil | 2018-04-17 | 5 | -270/+426 |
| |\ \ \ | | |_|/ | |/| | | merging gmock generated matchers | ||||
| | | * | 193353312 | Gennadiy Civil | 2018-04-18 | 2 | -4/+16 |
| | |/ | |||||
| | * | cl/193060888refs/pull/1577/head | Gennadiy Civil | 2018-04-17 | 1 | -3/+3 |
| | | | |||||
| | * | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -30/+6 |
| | | | |||||
| | * | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 2 | -5/+55 |
| | | | |||||
| | * | test-meerging | Gennadiy Civil | 2018-04-16 | 2 | -34/+6 |
| | | |