Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support JSON output format in addition to XML | Petr Hosek | 2018-02-28 | 6 | -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_matcher | Gennadiy Civil | 2018-02-27 | 3 | -0/+137 |
|\ | | | | | Add matcher for std::variant. | ||||
| * | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest ↵ | Xiaoyi Zhang | 2018-02-27 | 5 | -126/+334 |
| |\ | | | | | | | | | | into variant_matcher | ||||
| | * | Merge branch 'master' into variant_matcher | Xiaoyi Zhang | 2018-02-27 | 5 | -126/+334 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #1483 from gennadiycivil/master | Gennadiy Civil | 2018-02-27 | 3 | -123/+328 |
|\ \ \ | | | | | | | | | gmock merging -2 | ||||
| * \ \ | Merge branch 'master' into master | Gennadiy Civil | 2018-02-27 | 2 | -3/+6 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1423 from pcc/win-libcxx2 | Gennadiy Civil | 2018-02-27 | 2 | -3/+6 |
|\ \ \ \ | | | | | | | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. | ||||
| * \ \ \ | Merge branch 'master' into win-libcxx2 | Gennadiy Civil | 2018-02-27 | 52 | -354/+826 |
| |\ \ \ \ | |||||
| * | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. | Peter Collingbourne | 2018-01-25 | 1 | -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 Collingbourne | 2018-01-25 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | gmock merging -2 | Gennadiy Civil | 2018-02-27 | 3 | -123/+328 |
| |_|/ / / |/| | | | | |||||
| | | * | | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest ↵ | Xiaoyi Zhang | 2018-02-27 | 3 | -2/+16 |
| | | |\| | | | | | | | | | | | | | | | | into variant_matcher | ||||
| | | | * | Merge branch 'master' into variant_matcher | Gennadiy Civil | 2018-02-27 | 3 | -2/+16 |
| | | | |\ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1464 from pwnall/death-style | Gennadiy Civil | 2018-02-27 | 3 | -2/+16 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add preprocessor macro for default death test style. | ||||
| * | | | | Switch default death test style back to "fast". | Victor Costan | 2018-02-27 | 3 | -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 Zhang | 2018-02-27 | 1 | -0/+2 |
| | |/ | |||||
| | * | Add matcher for std::variant. | Xiaoyi Zhang | 2018-02-27 | 2 | -0/+135 |
| |/ |/| | |||||
* | | Merge pull request #1472 from AndersSundmanTobii/master | Gennadiy Civil | 2018-02-26 | 1 | -1/+1 |
|\ \ | | | | | | | Removed trailing comma in enum | ||||
| * \ | Merge branch 'master' into master | Gennadiy Civil | 2018-02-26 | 2 | -95/+86 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1475 from gennadiycivil/master | Gennadiy Civil | 2018-02-26 | 1 | -21/+19 |
|\ \ \ | | | | | | | | | merge check - 3 | ||||
| * | | | merging unittests - 5 | Gennadiy Civil | 2018-02-26 | 1 | -5/+5 |
| | | | | |||||
| * | | | merging unitests - check 4 | Gennadiy Civil | 2018-02-23 | 1 | -14/+13 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-23 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1474 from gennadiycivil/master | Gennadiy Civil | 2018-02-23 | 1 | -11/+3 |
|\ \ \ \ | | | | | | | | | | | merging unittests - 2 | ||||
| | * | | | merging unitests, check | Gennadiy Civil | 2018-02-23 | 1 | -4/+3 |
| |/ / / | |||||
| * / / | merging unittests - 2 | Gennadiy Civil | 2018-02-23 | 1 | -11/+3 |
|/ / / | |||||
* | | | Merge pull request #1473 from gennadiycivil/master | Gennadiy Civil | 2018-02-23 | 1 | -62/+63 |
|\ \ \ | | | | | | | | | merging unitests | ||||
| * | | | merging unitests | Gennadiy Civil | 2018-02-23 | 1 | -62/+63 |
|/ / / | |||||
* | | | Merge pull request #1471 from aleksejkozin/patch-1 | Gennadiy Civil | 2018-02-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | TEST() arguments are invalid in an example | ||||
| * \ \ | Merge branch 'master' into patch-1 | Aleksey Kozin | 2018-02-23 | 1 | -0/+2 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | TEST() arguments are invalid in an example | Aleksey Kozin | 2018-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Both names must be valid C++ identifiers, and they should not contain underscore (`_`) | ||||
| | * | | Removed trailing comma in enum | Anders Sundman (asum) | 2018-02-23 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1466 from pwnall/fix-death-warn | Gennadiy Civil | 2018-02-22 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Fix unused function warning on Mac OS. | ||||
| * | | Merge branch 'master' into fix-death-warn | Gennadiy Civil | 2018-02-22 | 1 | -0/+10 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1469 from gennadiycivil/master | Gennadiy Civil | 2018-02-22 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | merges | ||||
| * | | | merges | Gennadiy Civil | 2018-02-22 | 1 | -0/+10 |
| | | | | |||||
| | * | | Fix unused function warning on Mac OS. | Victor Costan | 2018-02-19 | 1 | -0/+2 |
| |/ / |/| | | | | | | | | | | | | | | | | | As of recently, Google Test fails to compile with the warning below when used in projects with strict warning settings. googletest/src/gtest-death-test.cc:1004:13: error: unused function 'StackGrowsDown' [-Werror,-Wunused-function] | ||||
* | | | Merge pull request #1450 from pwnall/fix-printers | Gennadiy Civil | 2018-02-15 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fix std::iscntrl use in gtest-printers.cc | ||||
| * \ \ | Merge branch 'master' into fix-printers | Gennadiy Civil | 2018-02-15 | 12 | -54/+67 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1459 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 3 | -26/+34 |
|\ \ \ \ | | |/ / | |/| | | cleanup, merges | ||||
| * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-13 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1458 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 9 | -28/+33 |
|\ \ \ \ | | | | | | | | | | | cleanup, merges | ||||
| | * | | | cleanup, merges | Gennadiy Civil | 2018-02-13 | 3 | -26/+34 |
| |/ / / | |||||
| * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-13 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | cleanup/merges | Gennadiy Civil | 2018-02-13 | 9 | -28/+33 |
| | | | | |||||
| | * | | Merge branch 'master' into fix-printers | Gennadiy Civil | 2018-02-13 | 6 | -70/+88 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #1457 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 1 | -12/+12 |
|\| | | | | | | | | | | | merging, cleaning up | ||||
| * | | | merging, cleaning up | Gennadiy Civil | 2018-02-13 | 1 | -12/+12 |
|/ / / | |||||
* | | | Merge pull request #1456 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | merges | ||||
| * \ \ | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-13 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | |