| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into 2017_09_04_parametrized | Bernhard Bauer | 2017-09-06 | 2 | -3/+8 |
| |\ | |||||
| | * | Merge pull request #975 from LebedevRI/respect-option | Gennadiy Civil | 2017-09-05 | 2 | -3/+8 |
| | |\ | | | | | | | CMake: use threads if allowed and found, not just if found. | ||||
| | | * | CMake: use threads if allowed and found, not just if found. | Roman Lebedev | 2017-09-01 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user's cmakelists.txt first look for threads using find_package(Threads), then set(gtest_disable_pthreads ON), and then include googletest. GoogleTest will not look for threads. But since they have already been found before in user's cmakelists, it will use them regardless. This helped me fix build issue in darktable-org/rawspeed on windows/MSYS2, even though there are threads, and they are usable, googletest build was failing with issues about AutoHandle. I was first looking for threads, and only then including googletest, so no matter the value of gtest_disable_pthreads, it failed. The other obvious solution is for user to first include googletest, and only then look for threads by himself. | ||||
| * | | | Add a non-parametrized test. | Bernhard Bauer | 2017-09-04 | 1 | -0/+12 |
| | | | | |||||
| * | | | Allow macros inside of parametrized test names. | Bernhard Bauer | 2017-09-04 | 3 | -9/+31 |
| |/ / | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling. | ||||
| * | | Merge pull request #900 from Gallaecio/patch-1 | Gennadiy Civil | 2017-09-01 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix WhenSorted() documentation example | ||||
| | * | | Fix WhenSorted() documentation example | Gallaecio | 2016-10-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #783 from tobbi/cppcheck_perf_fixes | Gennadiy Civil | 2017-09-01 | 2 | -5/+5 |
| |\ \ \ | |_|/ |/| | | Performance fixes reported by cppcheck | ||||
| | * | | Performance fixes reported by cppcheck | Tobias Markus | 2016-05-22 | 2 | -6/+5 |
| | | | | |||||
| * | | | Merge pull request #1011 from zeitounator/wrong-version-reported | Gennadiy Civil | 2017-09-01 | 2 | -3/+3 |
| |\ \ \ | | | | | | | | | Wrong version reported (1.7.0 should be 1.8.0) | ||||
| | * \ \ | Merge branch 'master' into wrong-version-reported | Gennadiy Civil | 2017-08-21 | 118 | -27409/+1518 |
| | |\ \ \ | |||||
| | * | | | | googlemock version must be changed as well | Olivier Clavel | 2017-02-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | keep googletest and googlemock versions in sync | ||||
| | * | | | | Wrong version reported (1.7.0 should be 1.8.0) | Olivier Clavel | 2017-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | `gtest-config --version` reports wrong version. Made against master branch but please note that this affects tag release-1.8.0 and the distribution tarballs. | ||||
| * | | | | | Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-type | Gennadiy Civil | 2017-09-01 | 3 | -13/+24 |
| |\ \ \ \ \ | | | | | | | | | | | | | use cmake build type defined in .travis.yml for travis builds | ||||
| | * \ \ \ \ | Merge branch 'master' into hethi/issue-1175-cmake-build-type | Herbert Thielen | 2017-08-31 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into hethi/issue-1175-cmake-build-type | Gennadiy Civil | 2017-08-31 | 2 | -2/+2 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-1175-cmake-build-type | Herbert Thielen | 2017-08-31 | 4 | -3/+10 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-1175-cmake-build-type | Herbert Thielen | 2017-08-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | create different python based tests for single and multi configuration build ↵ | Herbert Thielen | 2017-08-30 | 1 | -9/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generators | ||||
| | * | | | | | | | | | Revert "ask cmake for per-configuration output subdir" | Herbert Thielen | 2017-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e. Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't help here. | ||||
| | * | | | | | | | | | ask cmake for per-configuration output subdir | Herbert Thielen | 2017-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On single-configuration build systems as Makefile Generators, there is no subdirectory for the configuration in the build tree - therefore ask cmake for the subdir by using CMAKE_CFG_INTDIR, which is just '.' on single-configuration build systems (Linux et al.). | ||||
| | * | | | | | | | | | remove obsolete comment regarding python tests on linux | Herbert Thielen | 2017-08-30 | 1 | -2/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | use upper-case build type | Herbert Thielen | 2017-08-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While cmake does not complain on build type 'debug', the cmake documentation always spells it 'Debug', so take this. | ||||
| | * | | | | | | | | | use build type set in .travis.yml | Herbert Thielen | 2017-08-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BUILD_TYPE variable of .travis.yml was ignored up to now. | ||||
| * | | | | | | | | | | Merge pull request #870 from KindDragon/mingw64-appveyour | Gennadiy Civil | 2017-09-01 | 1 | -36/+53 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | AppVeyor MinGW-w64 test build | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mingw64-appveyour | Arkady Shapkin | 2017-09-01 | 10 | -13/+13 |
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1241 from aninf-wo/hethi/issue-635-old-links | Gennadiy Civil | 2017-08-31 | 10 | -13/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | change links from former code.google.com to current github repository | ||||
| | * | | | | | | | | | | change links from former code.google.com to current github repository | Herbert Thielen | 2017-08-31 | 10 | -13/+13 |
| | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'master' into mingw64-appveyour | Arkady Shapkin | 2017-08-31 | 4 | -5/+4 |
| | | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment | Gennadiy Civil | 2017-08-31 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | fix example's comment | ||||
| | * | | | | | | | | | Merge branch 'master' into hethi/fix-faq-example-comment | Herbert Thielen | 2017-08-31 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #865 from frosteyes/master | Gennadiy Civil | 2017-08-31 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | Moved the ignoring of *.pyc files to top level | ||||
| | * | | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyes | Claus Stovgaard | 2017-08-31 | 159 | -28687/+3877 |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitignore | ||||
| | * | | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyes | Claus Stovgaard | 2017-04-05 | 10 | -19/+139 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Moved the ignoring of *.pyc files to top level for also covering googlemock ↵ | Claus Stovgaard | 2016-08-30 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python scripts. | ||||
| | | | * | | | | | | | | fix example's comment | Herbert Thielen | 2017-08-31 | 1 | -2/+2 |
| | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake | Gennadiy Civil | 2017-08-30 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove non-existing gmock_build_samples switch | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/travis-unused-cmake | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into hethi/travis-unused-cmake | Herbert Thielen | 2017-08-30 | 5 | -13/+9 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | remove non-existing gmock_build_samples switch | Herbert Thielen | 2017-08-29 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| | | | | | | * | | | | | AppVeyor MinGW-w64 test build | Arkadiy Shapkin | 2017-08-31 | 1 | -36/+53 |
| | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1237 from sgraham/update-docs-3 | Gennadiy Civil | 2017-08-30 | 3 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change | ||||
| | * | | | | | | | | | Removed "Trivial" | Gennadiy Civil | 2017-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Who knows? may not be very trivial given the code drift between internal and OSS | ||||
| | * | | | | | | | | | removed internal link ( not allowed in OSS) | Gennadiy Civil | 2017-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Note that it is preferable for Googlers to create a CL internally first | Scott Graham | 2017-08-30 | 1 | -0/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into master | Gennadiy Civil | 2017-08-30 | 6 | -15/+11 |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuide | ||||
| | * | | | | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuide | Herbert Thielen | 2017-08-30 | 1 | -2/+2 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes issue #1087 | ||||
| * | | | | | | | | | Merge pull request #1226 from aninf-wo/hethi/fix-typo | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix typo in comment and string (SetUpTestCase) | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/fix-typo | Gennadiy Civil | 2017-08-29 | 10 | -14/+139 |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
 |
index : avr/qmk/googletest | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |