summaryrefslogtreecommitdiffstats
path: root/googletest/src
Commit message (Expand)AuthorAgeFilesLines
* Merging, XML testsrefs/pull/1497/headGennadiy Civil2018-03-071-3/+36
* merges-8refs/pull/1493/headGennadiy Civil2018-03-052-22/+38
* merges-7refs/pull/1492/headGennadiy Civil2018-03-051-25/+41
* Use a full message in the JSON output for failuresrefs/pull/1486/headPetr Hosek2018-03-011-2/+2
* Support JSON output format in addition to XMLPetr Hosek2018-02-281-10/+365
* Switch default death test style back to "fast".refs/pull/1464/headVictor Costan2018-02-271-1/+5
* Fix unused function warning on Mac OS.Victor Costan2018-02-191-0/+2
* Merge branch 'master' into fix-printersrefs/pull/1450/headGennadiy Civil2018-02-154-20/+21
|\
| * cleanup/mergesGennadiy Civil2018-02-134-20/+21
* | Fix std::iscntrl use in gtest-printers.ccVictor Costan2018-02-121-1/+3
|/
* Merging, coniniueGennadiy Civil2018-02-121-6/+4
* Merge branch 'master' into assertrefs/pull/1439/headGennadiy Civil2018-02-094-5/+11
|\
| * Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-093-4/+4
| |\
| | * Fixed typosrefs/pull/1446/headTroy Holsapple2018-02-083-4/+4
| * | mergesrefs/pull/1448/headGennadiy Civil2018-02-091-1/+7
| |/
* | Add ability to throw from ASSERTAlexey Sokolov2018-02-081-2/+5
|/
* upstream cl 182543808Gennadiy Civil2018-01-243-4/+95
* Many code merge/upstream changesGennadiy Civil2018-01-231-1/+1
* merges, cl/155419551 and otherGennadiy Civil2018-01-221-4/+5
* Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-181-20/+19
|\
| * Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-171-20/+19
* | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-1/+1
|/
* Upstream cl 103120214Gennadiy Civil2018-01-111-3/+2
* More merge, cleanupGennadiy Civil2018-01-101-6/+4
* Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-055-50/+11
|\
| * upstreaming cl 124976692Gennadiy Civil2018-01-035-50/+11
* | Pass the -Wmissing-declarations warning.David Benjamin2018-01-033-33/+41
|/
* Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-091-1/+4
|\
| * Merge branch 'master' into masterrefs/pull/1225/headGennadiy Civil2017-12-011-35/+29
| |\
| * | Speed up printing of characters which need hex escapingBrian Silverman2017-08-281-1/+4
* | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-011-3/+3
|\ \ \ | | |/ | |/|
| * | Fixes issue #826 by treating MinGW as "non-Windows" when determining colored ...refs/pull/1324/headwhame2017-11-071-3/+3
* | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-041-1/+1
|\ \ \ | |/ /
| * | Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-271-1/+1
* | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-241-30/+24
|\ \ \ | |/ /
| * | Make the failure messages from EXPECT_EQ and friends actually symmetric,refs/pull/1242/headAlexey Sokolov2017-09-131-4/+5
| * | 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-011-1/+1
| |\ \
| * | | 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-144-68/+98
| |\ \ \ | | | |/ | | |/|
| * | | Use GTEST_LOG instead of printfgpetit2017-08-141-23/+26
* | | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-042-12/+0
| |_|/ |/| |
* | | change links from former code.google.com to current github repositoryrefs/pull/1241/headHerbert Thielen2017-08-311-1/+1
| |/ |/|
* | Merge pull request #1127 from zulkarnine/patch-1Gennadiy Civil2017-08-111-3/+31
|\ \
| * | Remove duplicate coderefs/pull/1127/headZulkarnine Mahmud2017-07-161-16/+6
| * | Fix assumption for foreground bit offsetZulkarnine Mahmud2017-07-151-3/+16
| * | Remove unnecessary constZulkarnine Mahmud2017-06-291-1/+1
| * | Add helper functions for text color calculationZulkarnine Mahmud2017-06-291-24/+25
| * | Fix a problem when bg_color == fg_colorZulkarnine Mahmud2017-06-221-3/+24
| * | Add background_mask instead of using magic numberZulkarnine Mahmud2017-06-211-1/+2