summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Collapse)AuthorAgeFilesLines
* cl 189032107, againrefs/pull/1508/headGennadiy Civil2018-03-162-5/+19
|
* cl 189032107Gennadiy Civil2018-03-161-17/+9
|
* merge, again, IsRecursiveContainerrefs/pull/1507/headGennadiy Civil2018-03-154-20/+121
|
* erging, contrefs/pull/1504/headGennadiy 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 branch 'master' into upstream_188748737refs/pull/1503/headBernhard Bauer2018-03-1237-362/+2432
| |\
| * | 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-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
| | | | | | | | | | | | The full message unlike summary also includes stack trace.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-272-3/+6
|\ \ \ \ | |_|/ / |/| | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _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
| | | |
* | | | Switch default death test style back to "fast".refs/pull/1464/headVictor 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.
* | | 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
| | | | | | | | | | | | | | | Both names must be valid C++ identifiers, and they should not contain underscore (`_`)
* | | | | 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
| |\ \ \ | | | | | | | | | | merges
| | * | | mergesrefs/pull/1469/headGennadiy Civil2018-02-221-0/+10
| | | | |
* | | | | Fix unused function warning on Mac OS.Victor Costan2018-02-191-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 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
| | | |
generated by cgit v0.12 at 2024-11-19 08:28:01 (GMT)