summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* More merges, removing old dead codeGennadiy Civil2018-03-132-65/+6
* merges-port(1)refs/pull/1502/headGennadiy Civil2018-03-121-14/+22
* Merging, XML testsrefs/pull/1497/headGennadiy Civil2018-03-074-26/+114
* merges-8refs/pull/1493/headGennadiy Civil2018-03-053-27/+47
* merges-7refs/pull/1492/headGennadiy Civil2018-03-051-25/+41
* merges-6refs/pull/1491/headGennadiy Civil2018-03-055-7/+4
* merges-3Gennadiy Civil2018-03-051-1/+1
* Merge branch 'master' of https://github.com/google/googletestrefs/pull/1488/headGennadiy Civil2018-03-051-2/+2
|\
| * Use a full message in the JSON output for failuresrefs/pull/1486/headPetr Hosek2018-03-011-2/+2
* | Merges-1Gennadiy Civil2018-03-051-8/+12
|/
* Merge branch 'master' into jsonrefs/pull/1479/headGennadiy Civil2018-02-282-2/+4
|\
| * Merge branch 'master' into debug-postfixrefs/pull/1481/headGennadiy Civil2018-02-282-3/+6
| |\
| * \ Merge branch 'master' into debug-postfixGennadiy Civil2018-02-273-2/+16
| |\ \
| * | | Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIXDavid Neto2018-02-262-2/+4
* | | | Support JSON output format in addition to XMLPetr Hosek2018-02-286-10/+1403
| |_|/ |/| |
* | | Merge pull request #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-272-3/+6
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into win-libcxx2refs/pull/1423/headGennadiy Civil2018-02-2730-244/+592
| |\ \ | | |/
| * | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.Peter Collingbourne2018-01-251-2/+5
| * | Pass -EHs-c- to disable exceptions with MSVC.Peter Collingbourne2018-01-251-1/+1
* | | Switch default death test style back to "fast".refs/pull/1464/headVictor Costan2018-02-273-2/+16
| |/ |/|
* | Merge branch 'master' into masterrefs/pull/1472/headGennadiy Civil2018-02-262-95/+86
|\ \
| * | merging unittests - 5refs/pull/1475/headGennadiy Civil2018-02-261-5/+5
| * | merging unitests - check 4Gennadiy Civil2018-02-231-14/+13
| * | merging unitests, checkGennadiy Civil2018-02-231-4/+3
| * | merging unittests - 2refs/pull/1474/headGennadiy Civil2018-02-231-11/+3
| * | merging unitestsrefs/pull/1473/headGennadiy Civil2018-02-231-62/+63
| * | Merge branch 'master' into patch-1refs/pull/1471/headAleksey Kozin2018-02-221-0/+2
| |\ \
| * | | TEST() arguments are invalid in an exampleAleksey Kozin2018-02-221-1/+1
* | | | Removed trailing comma in enumAnders Sundman (asum)2018-02-231-1/+1
| |/ / |/| |
* | | Merge branch 'master' into fix-death-warnrefs/pull/1466/headGennadiy Civil2018-02-221-0/+10
|\ \ \ | |/ /
| * | Merge pull request #1469 from gennadiycivil/masterGennadiy Civil2018-02-221-0/+10
| |\ \
| | * | mergesrefs/pull/1469/headGennadiy Civil2018-02-221-0/+10
* | | | Fix unused function warning on Mac OS.Victor Costan2018-02-191-0/+2
|/ / /
* | | Merge branch 'master' into fix-printersrefs/pull/1450/headGennadiy Civil2018-02-1512-54/+67
|\ \ \ | |/ /
| * | cleanup, mergesGennadiy Civil2018-02-133-26/+34
| * | cleanup/mergesGennadiy Civil2018-02-139-28/+33
* | | Merge branch 'master' into fix-printersGennadiy Civil2018-02-132-21/+66
|\ \ \ | |/ /
| * | merging, cleaning uprefs/pull/1457/headGennadiy Civil2018-02-131-12/+12
| * | mergesGennadiy Civil2018-02-131-2/+1
| * | cxxx11refs/pull/1454/headGennadiy Civil2018-02-131-0/+3
| * | clang warningsGennadiy Civil2018-02-131-1/+1
| * | clang warningsGennadiy Civil2018-02-131-2/+2
| * | https://travis-ci.org/google/googletest/jobs/340995238Gennadiy Civil2018-02-131-5/+5
| * | clang warning 'https://travis-ci.org/google/googletest/jobs/340987201'Gennadiy Civil2018-02-131-4/+4
| * | clang warning https://travis-ci.org/google/googletest/jobs/340978022Gennadiy Civil2018-02-131-1/+1
| * | mergesGennadiy Civil2018-02-131-3/+46
* | | Fix std::iscntrl use in gtest-printers.ccVictor Costan2018-02-121-1/+3
|/ /
* | Merging, coniniueGennadiy Civil2018-02-122-7/+9
* | mergingrefs/pull/1449/headGennadiy Civil2018-02-091-2/+0
* | mergesGennadiy Civil2018-02-091-11/+40