aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * clang 3.7->3.9Gennadiy Civil2018-08-291-2/+2
| |
| * Update .travis.ymlGennadiy Civil2018-08-291-9/+3
| | | | | | Bring travil yml back to the master branch state
| * Update .travis.ymlGennadiy Civil2018-08-291-1/+9
| |
| * Testing, trying to figure out clang errors Gennadiy Civil2018-08-291-2/+0
| | | | | | Possibly related to travis env
| * Disable MCVS warningsGennadiy Civil2018-08-281-0/+8
| |
| * typoGennadiy Civil2018-08-281-1/+1
| |
| * typoGennadiy Civil2018-08-281-1/+1
| |
| * MSVC warnings silenceGennadiy Civil2018-08-281-1/+7
| |
| * Update googletest-output-test-golden-lin.txtGennadiy Civil2018-08-281-5/+55
| |
| * Googletest exportAbseil Team2018-08-282-3/+4
| | | | | | | | | | | | | | | | | | Fix line that was wrapping in the middle of a link This looks uglier, but has the advantage that the link is kept in one piece. PiperOrigin-RevId: 210537337
| * Googletest exportAbseil Team2018-08-284-53/+247
| | | | | | | | | | | | | | | | Add the possibility of specifying the name in type parameterized tests. Similar to how the last parameter of INSTANTIATE_TEST_CASE_P allows to override the name for (non-type) parametrized tests, this adds the possibility of adding a parameter to INSTANTIATE_TYPED_TEST_CASE_P. The argument has to be a class, which contains a static templated function GetName<T>(int), returning the name for type T. PiperOrigin-RevId: 210532231
| * Googletest exportAbseil Team2018-08-285-580/+265
| | | | | | | | | | | | Breaks Windows builds PiperOrigin-RevId: 210434120
| * Googletest exportAbseil Team2018-08-285-265/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Theta(N^2) memory usage of EXPECT_EQ(string) when the strings don't match. The underlying CalculateOptimalEdits() implementation used a simple dynamic-programming approach that always used N^2 memory and time. This meant that tests for equality of large strings were ticking time bombs: They'd work fine as long as the test passed, but as soon as the strings differed the test would OOM, which is very hard to debug. I switched it out for a Dijkstra search, which is still worst-case O(N^2), but in the usual case of mostly-matching strings, it is much closer to linear. PiperOrigin-RevId: 210405025
| * Googletest exportmisterg2018-08-281-6/+1
|/ | | | | | Code Cleanup PiperOrigin-RevId: 210393771
* Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readmeGennadiy Civil2018-08-271-0/+2
|\ | | | | New Readme.md
| * New Readme.mdDavid Schuldenfrei2018-08-271-0/+2
|/
* Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-272-4/+4
|\ | | | | Use `$<INSTALL_PREFIX>` in `target_include_directories`
| * Merge branch 'master' into fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-277-109/+387
| |\ | |/ |/|
* | Update CONTRIBUTING.mdGennadiy Civil2018-08-271-2/+1
| |
* | Merge 72a2836945e7a3dcee0730166704587e10bf64ee into ↵David Schuldenfrei2018-08-274-73/+333
| | | | | | | | | | | | | | | | | | | | 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 Closes #1658 Review and changes, mister@google.com PiperOrigin-RevId: 210374286