| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #1338 from stefanosoffia/master | Gennadiy Civil | 2018-08-22 | 6 | -178/+93 | |
| |\ \ | | | | | | | Install CMake export files | |||||
| | * | | Install CMake export filesrefs/pull/1338/head | Stefano Soffia | 2018-08-22 | 6 | -178/+93 | |
| |/ / | | | | | | | Rework of the closed pull request #768 | |||||
| * | | Merge pull request #1682 from dakotahawkins/improve-exported-targets | Gennadiy Civil | 2018-08-21 | 4 | -20/+122 | |
| |\ \ | | | | | | | Improve CMake exported targets | |||||
| | * | | Improve CMake exported targets.refs/pull/1682/head | Dakota Hawkins | 2018-08-21 | 4 | -20/+122 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | I _think_ this represents some of the "best practices" for exporting targets. They'll be available in a `googletest::` namespace (e.g. `googletest::gmock`) with non-namespaced `ALIAS` targets. - Added GOOGLETEST_VERSION variable - Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8 Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com> | |||||
| * | | Merge pull request #1194 from joshbodily/josh/fix_scoped_class2 | Gennadiy Civil | 2018-08-21 | 2 | -0/+21 | |
| |\ \ | | | | | | | Fix scoped enum not working in gmock-gen.py | |||||
| | * \ | Merge branch 'master' into josh/fix_scoped_class2refs/pull/1194/head | Gennadiy Civil | 2018-08-20 | 23 | -40/+203 | |
| | |\ \ | |/ / |/| | | ||||||
| * | | | Update CONTRIBUTING.md | Gennadiy Civil | 2018-08-20 | 1 | -4/+5 | |
| | | | | ||||||
| * | | | Merge pull request #1759 from gennadiycivil/master | Gennadiy Civil | 2018-08-20 | 0 | -0/+0 | |
| |\ \ \ | | | | | | | | | merge | |||||
| | * \ \ | mergerefs/pull/1759/head | Gennadiy Civil | 2018-08-20 | 14 | -19/+70 | |
| | |\ \ \ | |/ / / |/| | | | ||||||
| * | | | | googletest export | misterg | 2018-08-20 | 11 | -9/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | - 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457654 | |||||
| * | | | | googletest export | misterg | 2018-08-20 | 3 | -0/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | - 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457486 | |||||
| | * | | | Testing, adding a few line to sample4refs/pull/1758/head | Gennadiy Civil | 2018-08-20 | 13 | -532/+21 | |
| | | | | | ||||||
| | * | | | Testing, adding to sample4 unittest | Gennadiy Civil | 2018-08-20 | 10 | -0/+532 | |
| |/ / / | ||||||
| * | | | Merge pull request #1754 from vkotovv/docs-advanced-broken-links | Gennadiy Civil | 2018-08-20 | 1 | -5/+5 | |
| |\ \ \ | | | | | | | | | docs: fixed broken references to sections in Advanced guide | |||||
| | * | | | docs: fix more broken links to sections in Advanced guiderefs/pull/1754/head | Vadim Kotov | 2018-08-20 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | docs: fixed broken references to sections in Advanced guide | Vadim Kotov | 2018-08-20 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116 | Gennadiy Civil | 2018-08-20 | 1 | -2/+2 | |
| |\ \ \ \ | |/ / / |/| | | | Allow death test child to bypass Windows Error Reporting under MinGW | |||||
| | * | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116refs/pull/1120/head | Gennadiy Civil | 2018-08-20 | 1 | -0/+17 | |
| | |\ \ \ | |/ / / |/| | | | ||||||
| * | | | | Merge pull request #1347 from Burgch/fix-argc | Gennadiy Civil | 2018-08-19 | 1 | -0/+17 | |
| |\ \ \ \ | | | | | | | | | | | Fix value pointed to by `_NSGetArgc()` on macOS. | |||||
| | * \ \ \ | Merge branch 'master' into fix-argcrefs/pull/1347/head | Gennadiy Civil | 2018-08-19 | 3 | -8/+14 | |
| | |\ \ \ \ | |/ / / / |/| | | | | ||||||
| | * | | | | Minor formatting/style changes | Gennadiy Civil | 2018-08-17 | 1 | -8/+7 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' into fix-argc | Conor Burgess | 2018-08-17 | 222 | -7276/+13402 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into fix-argc | Conor Burgess | 2018-02-12 | 66 | -388/+1319 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into fix-argc | Conor Burgess | 2018-01-12 | 84 | -917/+1031 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' into fix-argc | Gennadiy Civil | 2017-12-08 | 4 | -1/+8 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix location of `_NSGetArgv` correction. | Conor Burgess | 2017-12-07 | 1 | -10/+11 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Fix value pointed to by `_NSGetArgc()` on macOS | Conor Burgess | 2017-12-07 | 1 | -0/+16 | |
| | | | | | | | | | | ||||||
| | | | | | | * | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 | Gennadiy Civil | 2018-08-18 | 2 | -4/+10 | |
| | | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning | Gennadiy Civil | 2018-08-18 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove default /EHsc compiler flag | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/head | Gennadiy Civil | 2018-08-17 | 203 | -3123/+3652 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | | Remove default /EHsc compiler flag | Wojciech Kaluza | 2018-07-11 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents warning D9025 (one command-line option overrides another) on MSVC builds: some test targets are built with the /EHs-c- which conflicts with /EHsc. | |||||
| * | | | | | | | | | | Merge pull request #1652 from medithe/patch-1 | Gennadiy Civil | 2018-08-18 | 1 | -4/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Cast the tr1::tuple_element template parameter to int | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into patch-1refs/pull/1652/head | Gennadiy Civil | 2018-08-17 | 1 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Formatting | Gennadiy Civil | 2018-08-17 | 1 | -4/+5 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'master' into patch-1 | Gennadiy Civil | 2018-08-17 | 6 | -15/+93 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'master' into patch-1 | Gennadiy Civil | 2018-08-15 | 204 | -3409/+3903 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Cast the tr1::tuple_element template parameter to int | medithe | 2018-07-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because in `std::tr1::tuple_element` the first template parameter should be of type int (https://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.4/a00547.html), but the code inserts a size_t, the first template parameter should be casted to int before, to get rid of the following errors: googletest-src/googletest/include/gtest/gtest-printers.h:957:60: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {}; and googletest-src/googletest/include/gtest/gtest-printers.h:961:56: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get( | |||||
| | | | | | | | | | * | | | Merge branch 'fix_death_test_child_mingw_wer_issue1116' of ↵ | Tanzinul Islam | 2018-08-17 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116 | |||||
| | | | | | | | | | | * \ \ | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 | Gennadiy Civil | 2018-08-16 | 216 | -5507/+6416 | |
| | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | * | \ \ \ | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 | Tanzinul Islam | 2018-08-17 | 183 | -916/+1265 | |
| | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1748 from laixer/std | Gennadiy Civil | 2018-08-17 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | std references shouldn't be fully qualified | |||||
| | * | | | | | | | | | | | | | std references shouldn't be fully qualifiedrefs/pull/1748/head | Vadim Berezniker | 2018-08-17 | 1 | -4/+4 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge pull request #1546 from henryiii/cleanup-cmake | Gennadiy Civil | 2018-08-17 | 2 | -8/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up cache non-advanced variable for subproject | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into cleanup-cmakerefs/pull/1546/head | Henry Schreiner | 2018-08-17 | 3 | -7/+49 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1646 from tisi1988/master | Gennadiy Civil | 2018-08-16 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX: Compilation warning with GCC regarding a non-initialised member … | |||||
| | * | | | | | | | | | | | | | | was not quite right, refs/pull/1646/head | Gennadiy Civil | 2018-08-16 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fomatting | |||||
| | * | | | | | | | | | | | | | | Small formatting change | Gennadiy Civil | 2018-08-16 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And then we can merge | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into master | Gennadiy Civil | 2018-08-16 | 3 | -5/+58 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #1142 from scottslacksmith/master | Gennadiy Civil | 2018-08-16 | 1 | -2/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | Fix/silence false positive memory leaks reported by Microsoft's debug CRT | |||||
| | * | | | | | | | | | | | | | | Small style changes. refs/pull/1142/head | Gennadiy Civil | 2018-08-16 | 1 | -14/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just small style changes and we can accept this PR | |||||
 |
index : googletest.git | |
| Google's C++ test framework: https://github.com/google/googletest |
| summaryrefslogtreecommitdiffstats |