summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-2410-163/+193
|\
| * Merge pull request #1249 from stkhapugin/masterGennadiy Civil2017-09-231-1/+2
| |\
| | * Merge branch 'master' into masterrefs/pull/1249/headGennadiy Civil2017-09-239-162/+191
| | |\ | | |/ | |/|
| * | Merge pull request #1271 from google/revert-1245-2017_09_04_parametrizedGennadiy Civil2017-09-213-43/+9
| |\ \
| | * | 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-062-3/+8
| | |\ \
| | * | | Add a non-parametrized test.Bernhard Bauer2017-09-041-0/+12
| | * | | Allow macros inside of parametrized test names.Bernhard Bauer2017-09-043-9/+31
| * | | | Merge pull request #1265 from bkircher/redundant-declGennadiy Civil2017-09-201-4/+0
| |\ \ \ \
| | * | | | Remove redundant declarationrefs/pull/1265/headBenjamin Kircher2017-09-161-4/+0
| |/ / / /
| * | | | Merge pull request #1259 from ly2048/patch-1Gennadiy Civil2017-09-151-0/+2
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into patch-1refs/pull/1259/headly20482017-09-151-8/+16
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1255 from yursha/patch-1Gennadiy Civil2017-09-141-8/+16
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into patch-1refs/pull/1255/headAlex Yursha2017-09-134-118/+152
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' into patch-1Alex Yursha2017-09-123-30/+19
| | |\ \ \ \ \
| | * | | | | | Fix ellipsis position in examplesAlex Yursha2017-09-091-8/+16
| | | | * | | | Add explicit `CMAKE_DEBUG_POSTFIX` optionly20482017-09-141-0/+2
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #1242 from DarthGandalf/expectGennadiy Civil2017-09-134-118/+152
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | 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-112-28/+21
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-086-11/+42
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-0522-75/+103
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-314-3/+10
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importGennadiy Civil2017-08-301-2/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-3011-16/+141
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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-086-11/+42
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | * | | | | | | | | | 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-079-26/+70
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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-0181-1348/+2699
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | 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-14111-27398/+1254
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Use GTEST_LOG instead of printfgpetit2017-08-141-23/+26
| * | | | | | | | | | | | | Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environmentGennadiy Civil2017-09-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into hethi/cleanup-travis-environmentrefs/pull/1254/headHerbert Thielen2017-09-085-8/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | remove unused variables from travis environmentrefs/pull/1252/headHerbert Thielen2017-09-051-2/+2
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | | | | | | | | | | | * Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
| | | | | | | | | | | | * Merge branch 'master' into masterStepan Khapugin2017-09-084-7/+5
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | | | | | | | | | | | * Merge branch 'master' into masterStepan Khapugin2017-09-074-4/+37
| | | | | | | | | | | | |\ | | | | | | | |_|_|_|_|_|/ | | | | | | |/| | | | | |
| | | | | | | | | | | | * add a castStepan Khapugin2017-09-051-1/+2
| | | | | | | | |_|_|_|/ | | | | | | | |/| | | |
* | | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-086-11/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1251 from aninf-wo/hethi/drop-valgrind-installation-on-tr...Gennadiy Civil2017-09-081-2/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | drop unused valgrind package from installationrefs/pull/1251/headHerbert Thielen2017-09-051-2/+0
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #1243 from aninf-wo/hethi/travis-release-buildGennadiy Civil2017-09-084-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy functionrefs/pull/1243/headHerbert Thielen2017-09-071-7/+1