summaryrefslogtreecommitdiffstats
path: root/googletest/test
Commit message (Expand)AuthorAgeFilesLines
* merges, cl/155419551 and otherGennadiy Civil2018-01-222-19/+50
* more mergingrefs/pull/1415/headGennadiy Civil2018-01-222-6/+4
* mergingGennadiy Civil2018-01-221-2/+2
* code mergeGennadiy Civil2018-01-228-43/+44
* Adding python tests to Bazel build file. refs/pull/1412/headGennadiy Civil2018-01-181-1/+243
* Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-173-5/+22
* code merges, cleanupGennadiy Civil2018-01-101-1/+1
* revert googletest/test/gtest-param-test_test.ccrefs/pull/1395/headGennadiy Civil2018-01-101-46/+3
* code merge, cleanupsGennadiy Civil2018-01-104-19/+58
* [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcrefs/pull/1388/headLoo Rong Jie2018-01-091-3/+6
* Revert one file for nowGennadiy Civil2018-01-051-10/+0
* code cleanup in preparation for merges, cl 180857299Gennadiy Civil2018-01-0512-16/+19
* upstreaming cl 124976692Gennadiy Civil2018-01-0312-78/+0
* Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-072-11/+42
|\
| * Fix tests with VS2015 and VS2017Arkadiy Shapkin2017-10-252-11/+42
* | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-048-8/+8
|\ \ | |/
| * Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-278-8/+8
* | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-243-114/+147
|\ \ | |/
| * Revert "Allow macros inside of parametrized test names."refs/pull/1271/headGennadiy Civil2017-09-211-28/+0
| * Merge pull request #1245 from sheepmaster/2017_09_04_parametrizedGennadiy Civil2017-09-211-0/+28
| |\
| | * Add a non-parametrized test.Bernhard Bauer2017-09-041-0/+12
| | * Allow macros inside of parametrized test names.Bernhard Bauer2017-09-041-0/+16
| * | Make the failure messages from EXPECT_EQ and friends actually symmetric,refs/pull/1242/headAlexey Sokolov2017-09-133-114/+147
* | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-082-3/+3
|\ \ \ | |/ /
| * | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy functionrefs/pull/1243/headHerbert Thielen2017-09-071-7/+1
| * | avoid warning about unused variableHerbert Thielen2017-09-041-1/+7
| * | avoid -Wshadow warning on GCCHerbert Thielen2017-09-041-2/+2
| |/
* | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-046-38/+0
|/
* 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
* | fix typo in comment and string (SetUpTestCase)Herbert Thielen2017-08-291-2/+2
* | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-227-6/+126
|\ \
| * \ Merge branch 'master' into masterDaniel Krügler2017-08-216-6/+124
| |\ \
| | * \ Merge pull request #1191 from gennadiycivil/masterGennadiy Civil2017-08-111-0/+118
| | |\ \
| | | * | Addressing Commentsrefs/pull/1191/headmisterg2017-08-101-46/+22
| | | * | Added Copyrightmisterg2017-08-101-4/+32
| | | * | Initial Revision, review 164634031misterg2017-08-101-2/+0
| | | * | WIPmisterg2017-08-091-29/+3
| | | * | WIP, win testingmisterg2017-08-081-4/+7
| | | * | WIP, windows testingmisterg2017-08-081-2/+2
| | | * | WIP, windows testingmisterg2017-08-081-2/+2
| | | * | WIP, windows testingmisterg2017-08-081-3/+9
| | | * | WIPmisterg2017-08-081-0/+133
| | * | | Merge pull request #1030 from vpfautz/masterGennadiy Civil2017-08-035-5/+5
| | |\ \ \
| | | * | | Fixed some typosrefs/pull/1030/headvpfautz2017-02-265-5/+5
| | * | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-021-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | remove duplicated wordsrefs/pull/764/headLi Peng2016-04-271-1/+1
| | | | |/ | | | |/|
* | | | | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-221-1/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-101-0/+28
|/ / /
* | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-153-32/+29