aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| * | merging unittests - 5Gennadiy Civil2018-02-261-5/+5
| | |
| * | merging unitests - check 4Gennadiy Civil2018-02-231-14/+13
| | |
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-230-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1474 from gennadiycivil/masterGennadiy Civil2018-02-231-11/+3
|\ \ \ | | | | | | | | merging unittests - 2
| | * | merging unitests, checkGennadiy Civil2018-02-231-4/+3
| |/ /
| * / merging unittests - 2Gennadiy Civil2018-02-231-11/+3
|/ /
* | Merge pull request #1473 from gennadiycivil/masterGennadiy Civil2018-02-231-62/+63
|\ \ | | | | | | merging unitests
| * | merging unitestsGennadiy Civil2018-02-231-62/+63
|/ /
* | Merge pull request #1471 from aleksejkozin/patch-1Gennadiy Civil2018-02-231-1/+1
|\ \ | | | | | | TEST() arguments are invalid in an example
| * \ Merge branch 'master' into patch-1Aleksey Kozin2018-02-231-0/+2
| |\ \ | |/ / |/| |
| * | TEST() arguments are invalid in an exampleAleksey Kozin2018-02-231-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 pull request #1466 from pwnall/fix-death-warnGennadiy Civil2018-02-221-0/+2
|\ \ | |/ |/| Fix unused function warning on Mac OS.
| * Merge branch 'master' into fix-death-warnGennadiy Civil2018-02-221-0/+10
| |\ | |/ |/|
* | Merge pull request #1469 from gennadiycivil/masterGennadiy Civil2018-02-221-0/+10
|\ \ | | | | | | merges
| * | mergesGennadiy 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 pull request #1450 from pwnall/fix-printersGennadiy Civil2018-02-151-1/+3
|\ \ | | | | | | Fix std::iscntrl use in gtest-printers.cc
| * \ Merge branch 'master' into fix-printersGennadiy Civil2018-02-1512-54/+67
| |\ \ | |/ / |/| |
* | | Merge pull request #1459 from gennadiycivil/masterGennadiy Civil2018-02-133-26/+34
|\ \ \ | | |/ | |/| cleanup, merges
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1458 from gennadiycivil/masterGennadiy Civil2018-02-139-28/+33
|\ \ \ | | | | | | | | cleanup, merges
| | * | cleanup, mergesGennadiy Civil2018-02-133-26/+34
| |/ /
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| |\ \ | |/ / |/| |
| * | cleanup/mergesGennadiy Civil2018-02-139-28/+33
| | |
| | * Merge branch 'master' into fix-printersGennadiy Civil2018-02-136-70/+88
| | |\ | |_|/ |/| |
* | | Merge pull request #1457 from gennadiycivil/masterGennadiy Civil2018-02-131-12/+12
|\| | | | | | | | merging, cleaning up
| * | merging, cleaning upGennadiy Civil2018-02-131-12/+12
|/ /
* | Merge pull request #1456 from gennadiycivil/masterGennadiy Civil2018-02-131-2/+1
|\ \ | | | | | | merges
| * \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1454 from gennadiycivil/masterGennadiy Civil2018-02-131-7/+53
|\ \ \ | | | | | | | | merges
| | * | mergesGennadiy Civil2018-02-131-2/+1
| |/ /
| * | cxxx11Gennadiy 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
|/ /
* | Merge pull request #1452 from gennadiycivil/masterGennadiy Civil2018-02-124-49/+22
|\ \ | | | | | | moving JoinAsTuple to internal
| * \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-120-0/+0
| |\ \ | |/ / |/| |
| * | moving JoinAsTuple to internalGennadiy Civil2018-02-124-49/+22
| | |
| | * Fix std::iscntrl use in gtest-printers.ccVictor Costan2018-02-121-1/+3
| |/ |/| | | | | | | | | | | | | ContainsUnprintableControlCodes() in gtest-printers.cc passes a char argument to std::iscntrl. Although its argument is an int, std::iscntrl produces undefined behavior if its argument is not representable as an unsigned char. The standard library on Windows asserts that the argument is an unsigned char, resulting in an assertion crash on debug builds.
* | Merge pull request #1451 from gennadiycivil/masterGennadiy Civil2018-02-122-7/+9
|\| | | | | merges
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-120-0/+0
| |\ | |/ |/|