aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* erging, contGennadiy Civil2018-03-141-15/+4
|
* merging, mergingGennadiy Civil2018-03-132-39/+23
|
* fixing, was removing too muchGennadiy Civil2018-03-131-0/+37
|
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-134-8/+35
|\
| * Merge pull request #1503 from sheepmaster/upstream_188748737Gennadiy Civil2018-03-124-8/+35
| |\ | | | | | | Allow macros inside of parametrized test names.
| | * Merge branch 'master' into upstream_188748737Bernhard Bauer2018-03-1264-620/+3159
| | |\ | | |/ | |/|
| * | Merge pull request #1502 from gennadiycivil/masterGennadiy Civil2018-03-121-14/+22
| |\ \ | | | | | | | | merges-port(1)
| | | * Allow macros inside of parametrized test names.Bernhard Bauer2018-03-124-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling. Upstream of cr/188748737. Tested: Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
* | | | More merges, removing old dead codeGennadiy Civil2018-03-134-72/+14
| |/ / |/| |
* | | merges-port(1)Gennadiy Civil2018-03-121-14/+22
|/ /
* | Merge pull request #1497 from gennadiycivil/masterGennadiy Civil2018-03-074-26/+114
|\ \ | | | | | | Merging, XML tests
| * | Merging, XML testsGennadiy Civil2018-03-074-26/+114
|/ /
* | Merge pull request #1493 from gennadiycivil/masterGennadiy Civil2018-03-053-27/+47
|\ \ | | | | | | merges-8
| * | merges-8Gennadiy Civil2018-03-053-27/+47
|/ /
* | Merge pull request #1492 from gennadiycivil/masterGennadiy Civil2018-03-051-25/+41
|\ \ | | | | | | merges-7
| * | merges-7Gennadiy Civil2018-03-051-25/+41
|/ /
* | Merge pull request #1491 from gennadiycivil/masterGennadiy Civil2018-03-055-7/+4
|\ \ | | | | | | merges-6
| * | merges-6Gennadiy Civil2018-03-055-7/+4
|/ /
* | Merge pull request #1490 from gennadiycivil/masterGennadiy Civil2018-03-051-1/+1
|\ \ | | | | | | merges-4
| * \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-050-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1489 from gennadiycivil/masterGennadiy Civil2018-03-052-4/+14
|\ \ \ | | | | | | | | Merges-2
| | * | merges-3Gennadiy Civil2018-03-051-1/+1
| |/ /
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-050-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1488 from gennadiycivil/masterGennadiy Civil2018-03-053-12/+17
|\ \ \ | | | | | | | | Merges
| | * | merges-2Gennadiy Civil2018-03-052-4/+14
| |/ /
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-053-2/+8
| |\ \ | |/ / |/| |
* | | Merge pull request #1477 from sgraham/unsigned-wcharGennadiy Civil2018-03-052-0/+6
|\ \ \ | | | | | | | | Try to handle unsigned wchar_t (arm) a bit better
| * \ \ Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-051-2/+2
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1486 from petrhosek/json-stacktraceGennadiy Civil2018-03-021-2/+2
|\ \ \ \ | | | | | | | | | | Use a full message in the JSON output for failures
| * | | | Use a full message in the JSON output for failuresPetr Hosek2018-03-011-2/+2
|/ / / / | | | | | | | | | | | | The full message unlike summary also includes stack trace.
| * | | Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-0114-139/+1880
| |\ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into unsigned-wcharGennadiy Civil2018-02-273-2/+16
| |\ \ \
| * \ \ \ Merge branch 'master' into unsigned-wcharGennadiy Civil2018-02-262-22/+20
| |\ \ \ \
| * | | | | Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-232-0/+6
| | | | | |
| | | | * | Merges-1Gennadiy Civil2018-03-053-12/+17
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1485 from coryan/parallelize-appveyorGennadiy Civil2018-02-281-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Add options to parallelize builds.
| * | | | | Add options to parallelize builds.Carlos O'Ryan2018-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | AppVeyor build servers have two cores, so why not use them?
* | | | | | Merge pull request #1479 from petrhosek/jsonGennadiy Civil2018-02-286-10/+1403
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Support JSON output format in addition to XML
| * | | | | Merge branch 'master' into jsonGennadiy Civil2018-02-282-2/+4
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1481 from dneto0/debug-postfixGennadiy Civil2018-02-282-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX
| * \ \ \ \ \ Merge branch 'master' into debug-postfixGennadiy Civil2018-02-287-126/+471
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into debug-postfixGennadiy Civil2018-02-273-2/+16
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIXDavid Neto2018-02-262-2/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_DEBUG_POSTFIX is a global configuration parameter, and changing it pollutes the configuration space for other projects that enclose this project. DEBUG_POSTFIX is better to use since it is a target-specific poperty. Fixes #1334 Fixes #1268
| | | * | | Support JSON output format in addition to XMLPetr Hosek2018-02-286-10/+1403
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | This change allows emitting output in JSON format in addition to the already supported XML format. The implementation as well as the file structure is intentionally modelled after the XML one.
* | | | | Merge pull request #1482 from zhangxy988/variant_matcherGennadiy Civil2018-02-273-0/+137
|\ \ \ \ \ | | | | | | | | | | | | Add matcher for std::variant.
| * \ \ \ \ Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest ↵Xiaoyi Zhang2018-02-275-126/+334
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into variant_matcher
| | * \ \ \ \ Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-275-126/+334
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #1483 from gennadiycivil/masterGennadiy Civil2018-02-273-123/+328
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | gmock merging -2
| * \ \ \ \ \ \ Merge branch 'master' into masterGennadiy Civil2018-02-272-3/+6
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-272-3/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-26 15:30:14 +0000