aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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.
| * | | | | | | Merge branch 'master' into win-libcxx2Gennadiy Civil2018-02-2752-354/+826
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.Peter Collingbourne2018-01-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _HAS_EXCEPTIONS is specific to the MSVC STL and defining it to 0 causes problems with libc++, so libc++ users may leave it undefined. This can cause GTEST_HAS_EXCEPTIONS to be defined incorrectly if the user has disabled exceptions via the compiler, which can lead to build errors. _CPPUNWIND is a builtin macro provided by the compiler so it should work with both STLs.
| * | | | | | | Pass -EHs-c- to disable exceptions with MSVC.Peter Collingbourne2018-01-251-1/+1
| | | | | | | |
| | | * | | | | gmock merging -2Gennadiy Civil2018-02-273-123/+328
| |_|/ / / / / |/| | | | | |
| | | * | | | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest ↵Xiaoyi Zhang2018-02-273-2/+16
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | into variant_matcher
| | | | * | | Merge branch 'master' into variant_matcherGennadiy Civil2018-02-273-2/+16
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #1464 from pwnall/death-styleGennadiy Civil2018-02-273-2/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add preprocessor macro for default death test style.
| * | | | | | Switch default death test style back to "fast".Victor Costan2018-02-273-2/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google Test has recently (02/09/2018) switched the default death test style from "fast" to "threadsafe" in https://github.com/google/googletest/commit/ec7faa943d7817c81ce7bdf71a21ebc9244dc8de Threadsafe death tests have been used internally for a while, and are proven to be a better default. However, adopting this better default can be challenging for large projects with a significant investment in custom infrastructure built on top of Google Test. The same custom infrastructure can make it difficult for large projects to switch back to the old default by passing in --gtest_death_test_style=fast. For the reasons above, the default switch is considered too disruptive, and this CL reverts it. This CL also introduces the GTEST_DEFAULT_DEATH_TEST_STYLE preprocesor macro, which replaces the hard-coded default. The macro can be defined in gtest/internal/custom/gtest-port.h by projects that are ready to migrate to thread-safe death tests.
| | * / / / Add documentation for VariantWith.Xiaoyi Zhang2018-02-271-0/+2
| | |/ / /
| | * / / Add matcher for std::variant.Xiaoyi Zhang2018-02-272-0/+135
| |/ / / |/| | |
* | | | Merge pull request #1472 from AndersSundmanTobii/masterGennadiy Civil2018-02-261-1/+1
|\ \ \ \ | | | | | | | | | | Removed trailing comma in enum
| * \ \ \ Merge branch 'master' into masterGennadiy Civil2018-02-262-95/+86
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1475 from gennadiycivil/masterGennadiy Civil2018-02-261-21/+19
|\ \ \ \ \ | |_|_|/ / |/| | | | merge check - 3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 12:03:33 +0000