summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-248-153/+175
|\
| * Merge branch 'master' into masterrefs/pull/1249/headGennadiy Civil2017-09-237-152/+173
| |\
| | * Revert "Allow macros inside of parametrized test names."refs/pull/1271/headGennadiy Civil2017-09-213-43/+9
| | * Merge pull request #1245 from sheepmaster/2017_09_04_parametrizedGennadiy Civil2017-09-213-9/+43
| | |\
| | | * Merge branch 'master' into 2017_09_04_parametrizedrefs/pull/1245/headBernhard Bauer2017-09-061-2/+7
| | | |\
| | | * | Add a non-parametrized test.Bernhard Bauer2017-09-041-0/+12
| | | * | Allow macros inside of parametrized test names.Bernhard Bauer2017-09-043-9/+31
| | * | | Remove redundant declarationrefs/pull/1265/headBenjamin Kircher2017-09-161-4/+0
| | * | | Add explicit `CMAKE_DEBUG_POSTFIX` optionly20482017-09-141-0/+2
| | * | | Make the failure messages from EXPECT_EQ and friends actually symmetric,refs/pull/1242/headAlexey Sokolov2017-09-134-118/+152
| | * | | Merge pull request #1227 from aninf-wo/hethi/unused-importGennadiy Civil2017-09-121-1/+0
| | |\ \ \
| | | * \ \ Merge branch 'master' into hethi/unused-importrefs/pull/1227/headGennadiy Civil2017-09-111-26/+19
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-083-6/+11
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-059-24/+32
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-313-2/+10
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into hethi/unused-importGennadiy Civil2017-08-301-2/+2
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-301-2/+2
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | remove unused TestCase importHerbert Thielen2017-08-291-1/+0
| | * | | | | | | | | Merge pull request #1250 from aninf-wo/hethi/remove-linker-warning-on-non-exi...Gennadiy Civil2017-09-111-3/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-pathrefs/pull/1250/headHerbert Thielen2017-09-083-6/+11
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | * | | | | | | | remove obsolete link_directories commandHerbert Thielen2017-09-051-3/+0
| | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printfGennadiy Civil2017-09-111-26/+19
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into user_logger_inst...refs/pull/1203/headGasprd Petit2017-09-074-19/+34
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is exp...Gasprd Petit2017-09-071-16/+6
| | | * | | | | | | Merge branch 'master' into user_logger_instead_of_printfGennadiy Civil2017-09-0146-1246/+1932
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Removed extra colon in error loggpetit2017-08-141-1/+1
| | | * | | | | | | | Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printfrefs/pull/1202/headgpetit2017-08-1465-12085/+533
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Use GTEST_LOG instead of printfgpetit2017-08-141-23/+26
| * | | | | | | | | | | Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
| * | | | | | | | | | | Merge branch 'master' into masterStepan Khapugin2017-09-083-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' into masterStepan Khapugin2017-09-071-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | add a castStepan Khapugin2017-09-051-1/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-083-6/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy functionrefs/pull/1243/headHerbert Thielen2017-09-071-7/+1
| * | | | | | | | | | Merge branch 'master' into hethi/travis-release-buildHerbert Thielen2017-09-071-2/+7
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #975 from LebedevRI/respect-optionGennadiy Civil2017-09-051-2/+7
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | CMake: use threads if allowed and found, not just if found.refs/pull/975/headRoman Lebedev2017-09-011-2/+7
| * | | | | | | | | | avoid warning about unused variableHerbert Thielen2017-09-041-1/+7
| * | | | | | | | | | avoid -Wshadow warning on GCCHerbert Thielen2017-09-041-2/+2
| * | | | | | | | | | treat all warnings as errors for GCC (-Werror)Herbert Thielen2017-09-011-1/+1
| |/ / / / / / / / /
* | | | | | | | | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-0416-112/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #783 from tobbi/cppcheck_perf_fixesGennadiy Civil2017-09-012-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Performance fixes reported by cppcheckrefs/pull/783/headTobias Markus2016-05-222-6/+5
* | | | | | | | | Merge pull request #1011 from zeitounator/wrong-version-reportedGennadiy Civil2017-09-011-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into wrong-version-reportedrefs/pull/1011/headGennadiy Civil2017-08-2170-12089/+731
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Wrong version reported (1.7.0 should be 1.8.0)Olivier Clavel2017-02-131-1/+1
* | | | | | | | | | | Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-typeGennadiy Civil2017-09-011-11/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into hethi/issue-1175-cmake-build-typerefs/pull/1235/headHerbert Thielen2017-08-311-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeGennadiy Civil2017-08-311-2/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-313-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |