aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Try to fix gcc and clang issuesJonny007-MKD2018-09-132-1/+14
|
* Added special catch for std::exception in GTEST_TEST_NO_THROW_Jonny007-MKD2018-09-132-3/+29
|
* Merge pull request #1828 from gdsotirov/patch-1Gennadiy Civil2018-09-121-1/+1
|\ | | | | Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env
| * Merge branch 'master' into patch-1Gennadiy Civil2018-09-121-0/+1
| |\ | |/ |/|
* | Merge pull request #1829 from google/gennadiycivil-patch-1Gennadiy Civil2018-09-121-0/+1
|\ \ | | | | | | Update appveyor.yml
| * | Update appveyor.ymlGennadiy Civil2018-09-121-0/+1
|/ /
| * Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env to avoide comilation ↵Georgi D. Sotirov2018-09-121-1/+1
|/ | | | | error (with -Werror) The unused attribute was removed with commit 3299a23 on 2018-02-23, but it currently breaks build of 1.8.1, because of -Werror GCC parameter as reported in issue #1825.
* Merge pull request #1827 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-110-0/+0
|\ | | | | Googletest export
| * Googletest exportmisterg2018-09-112-12/+24
| | | | | | | | | | | | Project import sync PiperOrigin-RevId: 212450488
| * Googletest exportmisterg2018-09-112-24/+12
|/ | | | | | Internal Change PiperOrigin-RevId: 211798074
* Merge pull request #1820 from ↵Gennadiy Civil2018-09-102-12/+24
|\ | | | | | | | | Romain-Geissler/fix-gcc-misleading-indentation-warning-again Fix gcc misleading indentation again.
| * Fix gcc misleading indentation again.Romain Geissler2018-09-102-12/+24
|/
* Merge pull request #1814 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-060-0/+0
|\ | | | | Googletest export
| * Googletest exportmisterg2018-09-061-6/+24
| | | | | | | | | | | | Internal Change PiperOrigin-RevId: 211699161
| * Googletest exportAbseil Team2018-09-062-53/+31
| | | | | | | | | | | | Make EXPECT_THROW print the actual exception type on the "threw the wrong exception type" case if the actual exception is a std::exception PiperOrigin-RevId: 211524592
| * Googletest exportAbseil Team2018-09-062-31/+53
| | | | | | | | | | | | Make EXPECT_THROW print the actual exception type on the "threw the wrong exception type" case if the actual exception is a std::exception PiperOrigin-RevId: 211519873
| * Googletest exportmisterg2018-09-061-24/+6
|/ | | | | | Project import PiperOrigin-RevId: 211091791
* Merge pull request #1809 from KindDragon/fix-doc-linksGennadiy Civil2018-09-0510-28/+27
|\ | | | | Fix doc links
| * Fix doc linksArkady Shapkin2018-09-0410-28/+27
|/
* Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfigGennadiy Civil2018-09-042-0/+2
|\ | | | | pkgconfig: Unconditionally depend on GTest when using GMock
| * Merge branch 'master' into fix-gmock-pkgconfigGennadiy Civil2018-09-049-373/+403
| |\ | |/ |/|
* | Merge pull request #1803 from KindDragon/patch-2Gennadiy Civil2018-09-048-372/+402
|\ \ | | | | | | Update documentation to syntax highlight code
| * | Update documentation to syntax highlight codeArkady Shapkin2018-09-038-372/+402
| | |
* | | Merge pull request #1806 from asiplas/masterGennadiy Civil2018-09-041-1/+1
|\ \ \ | |/ / |/| | Fix #1805: add `.md` to hyperlink
| * | Fix #1805: add `.md` to hyperlinkAndrew Siplas2018-09-031-1/+1
|/ /
| * pkgconfig: Unconditionally depend on GTest when using GMockDavid Seifert2018-09-022-0/+2
|/ | | | | * GTest is a required dependency for GMock, hence we always need to pull it in.
* Update README.mdGennadiy Civil2018-08-311-1/+1
|
* Merge pull request #1433 from dsacre/fix-clang-warningsGennadiy Civil2018-08-316-23/+443
|\ | | | | Fix Clang warnings
| * Merge branch 'master' into fix-clang-warningsGennadiy Civil2018-08-315-44/+45
| |\ | |/ |/|
* | Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-08-315-44/+45
|\ \ | | | | | | Googletest export
| * | Update googletest-output-test-golden-lin.txtGennadiy Civil2018-08-311-4/+4
| | |
| * | Update googletest-output-test-golden-lin.txtGennadiy Civil2018-08-301-10/+10
| | | | | | | | | manual update golden lin
| * | Update googletest-output-test-golden-lin.txtGennadiy Civil2018-08-301-10/+10
| | | | | | | | | manual update, golden lin
| * | Googletest exportmisterg2018-08-301-3/+5
| | | | | | | | | | | | | | | | | | Fix broken OSS windows build. PiperOrigin-RevId: 210969049
| * | Googletest exportmisterg2018-08-302-1/+15
| | | | | | | | | | | | | | | | | | Silence MSVC warnings PiperOrigin-RevId: 210726964
| * | Googletest exportAbseil Team2018-08-303-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Fix the typed test names in the tests for customized typed test parameters. As required by googletest documentation, the names should not contain an underscore. PiperOrigin-RevId: 210678652
| * | Googletest exportmisterg2018-08-303-19/+4
|/ / | | | | | | | | | | Internal Change PiperOrigin-RevId: 210594341
| * Add user-defined copy constructor to ValueArrayDominic Sacré2018-08-312-0/+414
| | | | | | | | | | | | Fix Clang warning: | warning: definition of implicit copy constructor for 'ValueArray2<bool, bool>' | is deprecated because it has a user-declared copy assignment operator [-Wdeprecated]
| * Add missing declarations for Google Tests flagsDominic Sacré2018-08-311-0/+8
| | | | | | | | | | | | | | | | | | | | Add declarations for install_failure_signal_handler and flagfile. Fix Clang warnings: | warning: no previous extern declaration for non-static variable | 'FLAGS_gtest_install_failure_signal_handler' [-Wmissing-variable-declarations] | warning: no previous extern declaration for non-static variable | 'FLAGS_gtest_flagfile' | [-Wmissing-variable-declarations]
| * Make g_argvs staticDominic Sacré2018-08-311-1/+1
| | | | | | | | | | | | Fix Clang warning: | warning: no previous extern declaration for non-static variable 'g_argvs' | [-Wmissing-variable-declarations]
| * Make dummy variables static to avoid compiler warningsDominic Sacré2018-08-311-2/+3
| | | | | | | | Fix -Wmissing-variable-declarations warnings from Clang.
| * Re-generate gtest-param-test.h from gtest-param-test.h.pumpDominic Sacré2018-08-311-20/+17
|/ | | | | | | | | Commit 6a26e47cfcc174cc85651cbde0b0158d03321e2f changed the formatting of INSTANTIATE_TEST_CASE_P() in the generated header file only. This commit reverts to the formatting produced by running "pump gtest-param-test.h.pump", which seems to be more consistent with the rest of the file.
* Merge pull request #1790 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-08-299-71/+326
|\ | | | | Googletest export
| * Update gmock-matchers.hGennadiy Civil2018-08-291-3/+4
| |
| * Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-08-293-3/+3
| |\ | |/ |/|
* | Changing clang tp 3.9 as 3.7 no longer works on TravisGennadiy Civil2018-08-291-2/+2
| |
* | Changing clang tp 3.9 as 3.7 no longer works on TravisGennadiy Civil2018-08-293-3/+3
| |
* | Merge pull request #1794 from BlueMonday/patch-1Gennadiy Civil2018-08-291-1/+1
|\ \ | | | | | | Fix broken FAQ link in primer.md
| * | Fix broken FAQ link in primer.mdSteven Santos Erenst2018-08-281-1/+1
|/ / | | | | The current link pointed to a non existing section in the FAQ.
| * clang 3.7 -> 3.9Gennadiy Civil2018-08-291-1/+1
| |