Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | this should be it | Gennadiy Civil | 2018-04-09 | 1 | -4/+0 | |
| | | ||||||
| * | yet more | Gennadiy Civil | 2018-04-09 | 1 | -3/+3 | |
| | | ||||||
| * | formatting | Gennadiy Civil | 2018-04-09 | 1 | -1/+3 | |
| | | ||||||
| * | more | Gennadiy Civil | 2018-04-09 | 1 | -6/+9 | |
| | | ||||||
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵ | Gennadiy Civil | 2018-04-10 | 1 | -3/+4 | |
|/ | | | | errors before merging the PR | |||||
* | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+1 | |
| | ||||||
* | more MSVC warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+11 | |
| | ||||||
* | fix build break on locale windows | fo40225 | 2018-04-04 | 1 | -1/+1 | |
| | ||||||
* | merging port, cont. 191443078refs/pull/1539/head | Gennadiy Civil | 2018-04-03 | 1 | -3/+5 | |
| | ||||||
* | merging, cont - 2 | Gennadiy Civil | 2018-04-03 | 1 | -16/+0 | |
| | ||||||
* | merging gtest-port.h , 191439094 | Gennadiy Civil | 2018-04-03 | 1 | -4/+7 | |
| | ||||||
* | merging, just comments formatrefs/pull/1537/head | Gennadiy Civil | 2018-04-03 | 1 | -1/+3 | |
| | ||||||
* | testing, merge | Gennadiy Civil | 2018-04-03 | 1 | -1/+1 | |
| | ||||||
* | Testing, gtest-port.h merge | Gennadiy Civil | 2018-04-03 | 1 | -0/+3 | |
| | ||||||
* | merging gtest-port.h, again - 1refs/pull/1534/head | Gennadiy Civil | 2018-04-02 | 1 | -5/+9 | |
| | ||||||
* | Revert "merging gtest-port 1 of N"refs/pull/1527/head | Gennadiy Civil | 2018-03-29 | 1 | -14/+9 | |
| | ||||||
* | Revert "merging gtest-port, 2"refs/pull/1526/head | Gennadiy Civil | 2018-03-29 | 1 | -9/+37 | |
| | ||||||
* | merging gtest-port, 2refs/pull/1525/head | Gennadiy Civil | 2018-03-29 | 1 | -37/+9 | |
| | ||||||
* | merging gtest-port 1 of Nrefs/pull/1518/head | Gennadiy Civil | 2018-03-27 | 1 | -9/+14 | |
| | ||||||
* | merges, gtest | Gennadiy Civil | 2018-03-26 | 1 | -0/+4 | |
| | ||||||
* | more merges | Gennadiy Civil | 2018-03-22 | 1 | -1/+1 | |
| | ||||||
* | More merges | Gennadiy Civil | 2018-03-21 | 1 | -1/+2 | |
| | ||||||
* | cl 189032107, againrefs/pull/1508/head | Gennadiy Civil | 2018-03-16 | 1 | -4/+19 | |
| | ||||||
* | cl 189032107 | Gennadiy Civil | 2018-03-16 | 1 | -17/+9 | |
| | ||||||
* | merge, again, IsRecursiveContainerrefs/pull/1507/head | Gennadiy Civil | 2018-03-15 | 2 | -18/+69 | |
| | ||||||
* | merging, merging | Gennadiy Civil | 2018-03-13 | 1 | -0/+2 | |
| | ||||||
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-13 | 3 | -8/+7 | |
|\ | ||||||
| * | Merge branch 'master' into upstream_188748737refs/pull/1503/head | Bernhard Bauer | 2018-03-12 | 6 | -98/+254 | |
| |\ | ||||||
| * | | Allow macros inside of parametrized test names. | Bernhard Bauer | 2018-03-12 | 3 | -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 code | Gennadiy Civil | 2018-03-13 | 1 | -8/+6 | |
| |/ |/| | ||||||
* | | merges-port(1)refs/pull/1502/head | Gennadiy Civil | 2018-03-12 | 1 | -14/+22 | |
| | | ||||||
* | | merges-8refs/pull/1493/head | Gennadiy Civil | 2018-03-05 | 1 | -5/+9 | |
| | | ||||||
* | | Merges-1 | Gennadiy Civil | 2018-03-05 | 1 | -8/+12 | |
| | | ||||||
* | | Merge pull request #1423 from pcc/win-libcxx2 | Gennadiy Civil | 2018-02-27 | 1 | -2/+5 | |
|\ \ | | | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. | |||||
| * \ | Merge branch 'master' into win-libcxx2refs/pull/1423/head | Gennadiy Civil | 2018-02-27 | 5 | -69/+193 | |
| |\ \ | ||||||
| * | | | 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. | |||||
* | | | | Switch default death test style back to "fast".refs/pull/1464/head | Victor Costan | 2018-02-27 | 1 | -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 enum | Anders Sundman (asum) | 2018-02-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | cleanup, merges | Gennadiy Civil | 2018-02-13 | 3 | -26/+34 | |
| | | | ||||||
* | | | cleanup/merges | Gennadiy Civil | 2018-02-13 | 2 | -5/+8 | |
| | | | ||||||
* | | | mergingrefs/pull/1449/head | Gennadiy Civil | 2018-02-09 | 1 | -2/+0 | |
| | | | ||||||
* | | | merges | Gennadiy Civil | 2018-02-09 | 1 | -11/+40 | |
| | | | ||||||
* | | | Merge branch 'master' into assertrefs/pull/1439/head | Gennadiy Civil | 2018-02-09 | 2 | -14/+15 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #1446 from tholsapp/master | Gennadiy Civil | 2018-02-09 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Fixed typos | |||||
| | * | | | Fixed typosrefs/pull/1446/head | Troy Holsapple | 2018-02-08 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | mergesrefs/pull/1448/head | Gennadiy Civil | 2018-02-09 | 1 | -13/+14 | |
| |/ / / | ||||||
* | | | | Add ability to throw from ASSERT | Alexey Sokolov | 2018-02-08 | 1 | -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 moderefs/pull/1435/head | Gennadiy Civil | 2018-01-31 | 1 | -1/+2 | |
| | | | ||||||
* | | | Code merges | Gennadiy Civil | 2018-01-30 | 1 | -15/+57 | |
| | | | ||||||
* | | | Ability to optionally depend on Abseil plus upstream of 183716547refs/pull/1434/head | Gennadiy Civil | 2018-01-30 | 1 | -0/+28 | |
|/ / |