aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avoid -Wshadow warning on GCCHerbert Thielen2017-09-041-2/+2
| | | | | | When using INSTANTIATE_TEST_CASE_P with a lambda function which uses 'info' as parameter name, GCC complains that this would shadow parameter 'info' used in the macro's VA_ARGS call.
* treat all warnings as errors for GCC (-Werror)Herbert Thielen2017-09-011-1/+1
|
* switch one build to Release modeHerbert Thielen2017-09-011-1/+1
| | | | | This turns on optimization which allows the compiler to discover more problems and omit some more warnings.
* Merge pull request #900 from Gallaecio/patch-1Gennadiy Civil2017-09-011-1/+1
|\ | | | | Fix WhenSorted() documentation example
| * Fix WhenSorted() documentation exampleGallaecio2016-10-081-1/+1
| |
* | Merge pull request #783 from tobbi/cppcheck_perf_fixesGennadiy Civil2017-09-012-5/+5
|\ \ | | | | | | Performance fixes reported by cppcheck
| * | Performance fixes reported by cppcheckTobias Markus2016-05-222-6/+5
| | |
* | | Merge pull request #1011 from zeitounator/wrong-version-reportedGennadiy Civil2017-09-012-3/+3
|\ \ \ | | | | | | | | Wrong version reported (1.7.0 should be 1.8.0)
| * \ \ Merge branch 'master' into wrong-version-reportedGennadiy Civil2017-08-21118-27409/+1518
| |\ \ \
| * | | | googlemock version must be changed as wellOlivier Clavel2017-02-131-2/+2
| | | | | | | | | | | | | | | keep googletest and googlemock versions in sync
| * | | | Wrong version reported (1.7.0 should be 1.8.0)Olivier Clavel2017-02-131-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-typeGennadiy Civil2017-09-013-13/+24
|\ \ \ \ \ | | | | | | | | | | | | use cmake build type defined in .travis.yml for travis builds
| * \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-311-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeGennadiy Civil2017-08-312-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-314-3/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-301-2/+2
| |\ \ \ \ \ \ \ \
| * | | | | | | | | create different python based tests for single and multi configuration build ↵Herbert Thielen2017-08-301-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generators
| * | | | | | | | | Revert "ask cmake for per-configuration output subdir"Herbert Thielen2017-08-301-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 subdirHerbert Thielen2017-08-301-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 linuxHerbert Thielen2017-08-301-2/+0
| | | | | | | | | |
| * | | | | | | | | use upper-case build typeHerbert Thielen2017-08-301-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.ymlHerbert Thielen2017-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BUILD_TYPE variable of .travis.yml was ignored up to now.
* | | | | | | | | | Merge pull request #870 from KindDragon/mingw64-appveyourGennadiy Civil2017-09-011-36/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | AppVeyor MinGW-w64 test build
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mingw64-appveyourArkady Shapkin2017-09-0110-13/+13
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1241 from aninf-wo/hethi/issue-635-old-linksGennadiy Civil2017-08-3110-13/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | change links from former code.google.com to current github repository
| * | | | | | | | | | change links from former code.google.com to current github repositoryHerbert Thielen2017-08-3110-13/+13
| | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into mingw64-appveyourArkady Shapkin2017-08-314-5/+4
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-commentGennadiy Civil2017-08-311-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | fix example's comment
| * | | | | | | | | Merge branch 'master' into hethi/fix-faq-example-commentHerbert Thielen2017-08-312-2/+2
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #865 from frosteyes/masterGennadiy Civil2017-08-312-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Moved the ignoring of *.pyc files to top level
| * | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyesClaus Stovgaard2017-08-31159-28687/+3877
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitignore
| * | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyesClaus Stovgaard2017-04-0510-19/+139
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Moved the ignoring of *.pyc files to top level for also covering googlemock ↵Claus Stovgaard2016-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python scripts.
| | | * | | | | | | | fix example's commentHerbert Thielen2017-08-311-2/+2
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmakeGennadiy Civil2017-08-301-1/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | remove non-existing gmock_build_samples switch
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/travis-unused-cmakeGennadiy Civil2017-08-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into hethi/travis-unused-cmakeHerbert Thielen2017-08-305-13/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | remove non-existing gmock_build_samples switchHerbert Thielen2017-08-291-1/+0
| | | | | | | | | | |
| | | | | | * | | | | AppVeyor MinGW-w64 test buildArkadiy Shapkin2017-08-311-36/+53
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1237 from sgraham/update-docs-3Gennadiy Civil2017-08-303-2/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change
| * | | | | | | | | Removed "Trivial" Gennadiy Civil2017-08-301-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 Civil2017-08-301-1/+1
| | | | | | | | | |
| * | | | | | | | | Note that it is preferable for Googlers to create a CL internally firstScott Graham2017-08-301-0/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into masterGennadiy Civil2017-08-306-15/+11
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguideGennadiy Civil2017-08-301-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuide
| * | | | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuideHerbert Thielen2017-08-301-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes issue #1087
* | | | | | | | | Merge pull request #1226 from aninf-wo/hethi/fix-typoGennadiy Civil2017-08-301-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix typo in comment and string (SetUpTestCase)
| * \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/fix-typoGennadiy Civil2017-08-2910-14/+139
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105Gennadiy Civil2017-08-291-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix typos mentioned in issue 1105
| * | | | | | | | | | use plural verb as mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
| | | | | | | | | | |