aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-06-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1624 from gennadiycivil/masterGennadiy Civil2018-06-1113-50/+33
|\ \ | | | | | | Adjust documentation files and links.
| | * Sync with internal docsGennadiy Civil2018-06-111-1/+1
| |/
| * Removed "Documentation.md" not adding value and not consitent with internal docsGennadiy Civil2018-06-112-17/+0
| |
| * Rename Samples.md to samples.md and adjust the linksGennadiy Civil2018-06-113-2/+2
| |
| * Rename FAQ.md to faq.md and adjust the links. Gennadiy Civil2018-06-114-4/+4
| | | | | | Part of documentation rationalization
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-06-111-2/+2
| |\ | |/ |/|
* | Merge pull request #1623 from Steelskin/fuchsia-fdioGennadiy Civil2018-06-111-2/+2
|\ \ | | | | | | Fuchsia: Change fdio include path.
| * | Fuchsia: Change fdio include path.Fabrice de Gans-Riberi2018-06-071-2/+2
|/ /
| * Rename AdvancedGuide.md to advanced.md and adjust the links. Gennadiy Civil2018-06-119-17/+17
| | | | | | Part of documentation rationalization work
| * Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion ↵Gennadiy Civil2018-06-117-15/+15
|/ | | | rationalzation
* Merge pull request #1619 from Steelskin/fuchsia-launchpad-removalGennadiy Civil2018-06-051-22/+21
|\ | | | | Remove launchpad dependency from Fuchsia.
| * Merge branch 'master' into fuchsia-launchpad-removalGennadiy Civil2018-06-042-0/+10
| |\ | |/ |/|
* | Merge pull request #1620 from gennadiycivil/masterGennadiy Civil2018-06-042-0/+10
|\ \ | | | | | | Adress, #1616, add printer for std::nullptr_t
| * | Upstream, cl/199129756Gennadiy Civil2018-06-042-0/+10
|/ / | | | | Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616
| * Merge branch 'master' into fuchsia-launchpad-removalGennadiy Civil2018-06-042-6/+5
| |\ | |/ |/|
* | Merge pull request #1608 from gennadiycivil/masterGennadiy Civil2018-06-012-6/+5
|\ \ | | | | | | formatting changes
| * | formatting changes Gennadiy Civil2018-05-232-6/+5
|/ /
| * Clean upFabrice de Gans-Riberi2018-05-311-5/+1
| |
| * Remvoe launchpad dependency from Fuchsia.Fabrice de Gans-Riberi2018-05-301-23/+26
|/
* Merge pull request #1607 from gennadiycivil/masterGennadiy Civil2018-05-2330-30/+30
|\ | | | | Formatting changes
| * Formatting changes Gennadiy Civil2018-05-2330-30/+30
|/
* Merge pull request #1603 from Steelskin/unused-variable-fuchsiaGennadiy Civil2018-05-221-1/+1
|\ | | | | Remove unused variable in Fuchsia.
| * Merge branch 'master' into unused-variable-fuchsiaGennadiy Civil2018-05-225-10/+65
| |\ | |/ |/|
* | Merge pull request #1591 from sgraham/disabled-rttiGennadiy Civil2018-05-222-8/+6
|\ \ | | | | | | Fix gmock not building when -fno-rtti
| * \ Merge branch 'master' into disabled-rttiGennadiy Civil2018-05-223-2/+59
| |\ \ | |/ / |/| |
* | | Merge pull request #1601 from jdennett/StdLibVersioningGennadiy Civil2018-05-223-2/+59
|\ \ \ | | | | | | | | Std lib versioning
| * | | Downgrade to C++98.James Dennett2018-05-211-6/+6
| | | | | | | | | | | | Some projects cannot handle C++11 yet.
| * | | Downgrade to C++98 code.James Dennett2018-05-211-6/+6
| | | | | | | | | | | | Some users are not ready for C++11 yet.
| * | | Merge branch 'master' into StdLibVersioningJames Dennett2018-05-212-4/+30
| |\ \ \ | |/ / / |/| | |
| * | | Add support for versioned standard libraries.James Dennett2018-05-101-2/+18
| | | | | | | | | | | | 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++.
| * | | Update generated code.James Dennett2018-05-101-2/+18
| | | |
| * | | Add unit test for CanonicalizeForStdLibVersioning.James Dennett2018-05-101-0/+25
| | | |
| | * | Merge branch 'master' into disabled-rttiScott Graham2018-05-1110-22/+273
| | |\ \ | |_|/ / |/| | |
| | * | Fix gmock not building when -fno-rttiScott Graham2018-05-022-8/+6
| | | | | | | | | | | | | | | | Fixes issue #1554. This is internal cl/195020996.
| | | * Remove unused variable in Fuchsia.Fabrice de Gans-Riberi2018-05-111-1/+1
| |_|/ |/| |
* | | 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.Jae 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 numberFabrice 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-011-29/+27
| |
| * Add Fuchsia support for death test.Fabrice de Gans-Riberi2018-05-014-4/+200
|/
* 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 matrixScott Graham2018-05-012-0/+11
|/
* Merge pull request #1588 from gennadiycivil/masterGennadiy Civil2018-04-254-597/+619
|\ | | | | mostly 193547722