summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest
Commit message (Collapse)AuthorAgeFilesLines
* VS2005 with SP1(_MSC_VER=1400) already supports __pragma杜修杏2018-06-291-1/+1
|
* Eliminate GTEST_TEST_FILTER_ENV_VAR_.refs/pull/1622/headRohan Joyce2018-06-141-5/+0
| | | | | | | | GTEST_TEST_FILTER_ENV_VAR_ was used to specify an environment variable to obtain the default test filter from. By default it was unset which broke "--test_filter" for bazel. This CL eliminates GTEST_TEST_FILTER_ENV_VAR_ and explicitly obtains the default test filter from the environment variable TESTBRIDGE_TEST_ONLY if it exists.
* Upstream, cl/199129756refs/pull/1620/headGennadiy Civil2018-06-041-0/+4
| | | Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616
* Formatting changes refs/pull/1607/headGennadiy Civil2018-05-2314-14/+14
|
* Downgrade to C++98.refs/pull/1601/headJames Dennett2018-05-211-6/+6
| | | Some projects cannot handle C++11 yet.
* Downgrade to C++98 code.James Dennett2018-05-211-6/+6
| | | Some users are not ready for C++11 yet.
* Add support for versioned standard libraries.James Dennett2018-05-111-2/+18
| | | This canonicalizes demangled names by omitting a nested inline namespace within namespace std if the name of the nested namespace begins with a double underscore. This improves compatibility with libc++.
* Update generated code.James Dennett2018-05-111-2/+18
|
* Fix more stuff and get tests to passFabrice de Gans-Riberi2018-05-031-1/+1
|
* Add Fuchsia support for death test.Fabrice de Gans-Riberi2018-05-012-1/+4
|
* mergingGennadiy Civil2018-04-101-1/+1
|
* mergingGennadiy Civil2018-04-101-3/+4
|
* mergeGennadiy Civil2018-04-101-4/+3
|\
| * Revert "gmock actions 2"refs/pull/1556/headGennadiy Civil2018-04-101-13/+0
| |
| * this should be itGennadiy Civil2018-04-091-4/+0
| |
| * yet moreGennadiy Civil2018-04-091-3/+3
| |
| * formattingGennadiy Civil2018-04-091-1/+3
| |
| * moreGennadiy Civil2018-04-091-6/+9
| |
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵Gennadiy Civil2018-04-101-3/+4
|/ | | | errors before merging the PR
* more warningsGennadiy Civil2018-04-061-0/+1
|
* more MSVC warningsGennadiy Civil2018-04-061-0/+11
|
* fix build break on locale windowsfo402252018-04-041-1/+1
|
* merging port, cont. 191443078refs/pull/1539/headGennadiy Civil2018-04-031-3/+5
|
* merging, cont - 2Gennadiy Civil2018-04-031-16/+0
|
* merging gtest-port.h , 191439094Gennadiy Civil2018-04-031-4/+7
|
* merging, just comments formatrefs/pull/1537/headGennadiy Civil2018-04-031-1/+3
|
* testing, mergeGennadiy Civil2018-04-031-1/+1
|
* Testing, gtest-port.h mergeGennadiy Civil2018-04-031-0/+3
|
* merging gtest-port.h, again - 1refs/pull/1534/headGennadiy Civil2018-04-021-5/+9
|
* Revert "merging gtest-port 1 of N"refs/pull/1527/headGennadiy Civil2018-03-291-14/+9
|
* Revert "merging gtest-port, 2"refs/pull/1526/headGennadiy Civil2018-03-291-9/+37
|
* merging gtest-port, 2refs/pull/1525/headGennadiy Civil2018-03-291-37/+9
|
* merging gtest-port 1 of Nrefs/pull/1518/headGennadiy 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, againrefs/pull/1508/headGennadiy Civil2018-03-161-4/+19
|
* cl 189032107Gennadiy Civil2018-03-161-17/+9
|
* merge, again, IsRecursiveContainerrefs/pull/1507/headGennadiy 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_188748737refs/pull/1503/headBernhard 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)refs/pull/1502/headGennadiy Civil2018-03-121-14/+22
| |
* | merges-8refs/pull/1493/headGennadiy 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-libcxx2refs/pull/1423/headGennadiy 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.