summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest
Commit message (Collapse)AuthorAgeFilesLines
...
* merging gtest-port, 2Gennadiy Civil2018-03-291-37/+9
|
* merging gtest-port 1 of NGennadiy Civil2018-03-271-9/+14
|
* merges, gtestGennadiy Civil2018-03-261-0/+4
|
* more mergesGennadiy Civil2018-03-221-1/+1
|
* More mergesGennadiy Civil2018-03-211-1/+2
|
* cl 189032107, againGennadiy Civil2018-03-161-4/+19
|
* cl 189032107Gennadiy Civil2018-03-161-17/+9
|
* merge, again, IsRecursiveContainerGennadiy Civil2018-03-152-18/+69
|
* merging, mergingGennadiy Civil2018-03-131-0/+2
|
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-133-8/+7
|\
| * Merge branch 'master' into upstream_188748737Bernhard Bauer2018-03-126-98/+254
| |\
| * | Allow macros inside of parametrized test names.Bernhard Bauer2018-03-123-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-8/+6
| |/ |/|
* | merges-port(1)Gennadiy Civil2018-03-121-14/+22
| |
* | merges-8Gennadiy Civil2018-03-051-5/+9
| |
* | Merges-1Gennadiy Civil2018-03-051-8/+12
| |
* | Merge pull request #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-271-2/+5
|\ \ | | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
| * \ Merge branch 'master' into win-libcxx2Gennadiy Civil2018-02-275-69/+193
| |\ \
| * | | 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.
* | | | Switch default death test style back to "fast".Victor Costan2018-02-271-0/+10
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Removed trailing comma in enumAnders Sundman (asum)2018-02-231-1/+1
| | |
* | | cleanup, mergesGennadiy Civil2018-02-133-26/+34
| | |
* | | cleanup/mergesGennadiy Civil2018-02-132-5/+8
| | |
* | | mergingGennadiy Civil2018-02-091-2/+0
| | |
* | | mergesGennadiy Civil2018-02-091-11/+40
| | |
* | | Merge branch 'master' into assertGennadiy Civil2018-02-092-14/+15
|\ \ \
| * \ \ Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-091-1/+1
| |\ \ \ | | | | | | | | | | Fixed typos
| | * | | Fixed typosTroy Holsapple2018-02-071-1/+1
| | | | |
| * | | | mergesGennadiy Civil2018-02-091-13/+14
| |/ / /
* / / / Add ability to throw from ASSERTAlexey Sokolov2018-02-081-1/+15
|/ / / | | | | | | | | | | | | | | | | | | while not losing benefits of EXPECT, and not killing the whole test, as with --gtest_throw_on_failure. 183822976
* | | Merges and also adding new bazel build modeGennadiy Civil2018-01-311-1/+2
| | |
* | | Code mergesGennadiy Civil2018-01-301-15/+57
| | |
* | | Ability to optionally depend on Abseil plus upstream of 183716547Gennadiy Civil2018-01-301-0/+28
|/ /
* / upstream cl 182543808Gennadiy Civil2018-01-241-0/+3
|/
* Merge branch 'master' into win-libcxxGennadiy Civil2018-01-232-4/+10
|\
| * merges, cl/155419551 and otherGennadiy Civil2018-01-221-4/+7
| |
| * Merge branch 'master' into support_xboxoneGennadiy Civil2018-01-183-72/+82
| |\
| * | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-0/+3
| | |
* | | Merge branch 'master' into win-libcxxGennadiy Civil2018-01-182-45/+53
|\ \ \ | | |/ | |/|
| * | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-172-45/+53
| | |
* | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under ↵Peter Collingbourne2018-01-171-1/+1
|/ / | | | | | | | | | | | | | | libc++. If _MSC_VER is defined, it means that we are using the Microsoft ABI, so cxxabi.h (which is associated with the Itanium ABI) will not be available.
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+1
| |
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-2/+3
| |
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+0
| |
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-4/+1
| |
* | More code mergesGennadiy Civil2018-01-151-18/+15
| |
* | Code mergingGennadiy Civil2018-01-152-8/+16
| |
* | continue upstream/merge, etcGennadiy Civil2018-01-111-4/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-112-4/+31
|
* More merge, cleanupGennadiy Civil2018-01-101-1/+1
|
OpenPOWER on IntegriCloud