summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest
Commit message (Collapse)AuthorAgeFilesLines
...
* | upstream cl 182543808Gennadiy Civil2018-01-241-0/+3
|/
* Merge branch 'master' into win-libcxxrefs/pull/1410/headGennadiy Civil2018-01-232-4/+10
|\
| * merges, cl/155419551 and otherGennadiy Civil2018-01-221-4/+7
| |
| * Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy 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-181-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 compilerefs/pull/1402/headGennadiy 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, etcrefs/pull/1400/headGennadiy Civil2018-01-111-4/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-112-4/+31
|
* More merge, cleanuprefs/pull/1398/headGennadiy Civil2018-01-101-1/+1
|
* More merge, cleanupGennadiy Civil2018-01-101-2/+1
|
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
|
* revertrefs/pull/1396/headGennadiy Civil2018-01-101-68/+9
|
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
|
* code merge, cleanupsGennadiy Civil2018-01-101-1/+1
|
* Upstream of cl 129104714refs/pull/1394/headGennadiy Civil2018-01-092-49/+50
|
* Revert one fileGennadiy Civil2018-01-091-2/+3
|
* wip, cleanups/mergeGennadiy Civil2018-01-092-5/+3
|
* cleanup, mergeGennadiy Civil2018-01-093-2/+4
|
* Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-051-1/+1
|\
| * Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.refs/pull/1377/headDavid Benjamin2018-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang-cl is clang for Windows running in MSVC mode. Chromium uses it for Windows builds. clang-cl is weird in that it defines __clang__ and _MSC_VER, but *NOT* __GNUC__. This is vaguely analogous to how normal clang defines __clang__ (what it is) and __GNUC__ (what it is compatible with). However, clang-cl still implements most GCC extensions, being clang. Notably, the way to control -Wformat-literal is still with __attribute__((__format__)). For better error-checking and strict -Wformatl-literal compatibility (see 53c478d639b8eebd2942e88266610ebc79c541f6), define GTEST_ATTRIBUTE_PRINTF_ in clang-cl too.
* | Pass the -Wmissing-declarations warning.David Benjamin2018-01-032-9/+9
|/ | | | | | This makes it easier to use GTest in projects that build with the -Wmissing-declarations warning. This fixes the warning in headers and source files, though not GTest's own tests as it is rather noisy there.
* Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
|\ | | | | Fix testing::Combine on MSVC 2017.
| * Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On platforms with std::tuple and not std::tr1::tuple, GTEST_HAS_COMBINE gets turned off when it works fine (due to GTEST_TUPLE_NAMESPACE_). Elsewhere in the project, several GTEST_HAS_TR1_TUPLE checks additionally check GTEST_HAS_STD_TUPLE_, so use that formulation. (The ones that don't are specific to std::tr1::tuple and are followed by an identical GTEST_HAS_STD_TUPLE_ version underneath it.) In particular, this fixes testing::Combine on MSVC 2017, which regressed here: https://github.com/google/googletest/pull/1348#issuecomment-353879010
* | Merge branch 'master' into uintptrrefs/pull/991/headGennadiy Civil2018-01-0210-76/+76
|\ \ | |/
| * Avoid warning C4619 in MSVC 2017.refs/pull/1109/headDavid Benjamin2017-12-251-0/+4
| | | | | | | | | | C4800 has since been removed in MSVC 2017, so trying to silence it throws warning C4619 when enabled.
| * Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/headGregory Pakosz2017-12-211-2/+0
| | | | | | | | | | C4389 was inhibited in commit 4b83461 making behavior inconsistent with other compilers.
| * Update gtest-param-test.h.pumprefs/pull/1248/headGennadiy Civil2017-12-191-3/+0
| |
| * Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-0/+3
| |
| * Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-091-0/+3
| |\
| | * Remove C4996 warning in VS2017refs/pull/1348/headWojciech Mamrak2017-12-071-0/+3
| | |
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-071-5/+10
| |\ \ | | |/
| | * Merge branch 'master' into gtestapifixrefs/pull/1304/headm-gupta2017-10-251-3/+8
| | |\
| | | * Enable C++11 features for VS2015 and VS2017Arkadiy Shapkin2017-10-251-3/+8
| | | |
| | * | googletest: Add GTEST_API_ attribute to ThreadLocal class.Manoj Gupta2017-10-201-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ThreadLocal class needs to be have default visibility. Root cause is gtest uses typeinfo for the ThreadLocal class. The problem manifests When gtest/gmock are built as a shared library with libc++. When a class is used in typeinfo, it must have default visibility. There is an explanation about typeinfo and visibility here: https://developer.apple.com/library/content/documentation/DeveloperTools/Conceptual/CppRuntimeEnv/Articles/SymbolVisibility.html When libc++ is used with gtest in shared library mode, any tests that are compiled with -fvisibility=hidden and exercise the macro EXPECT_CALL, it results in an abort like: [ FATAL ] /usr/include/gtest/internal/gtest-port.h:1394:: Condition typeid(*base) == typeid(Derived) failed. This is because the typeinfo for ThreadLocal class is not visible. Therefore, linker failed to match it to the shared library symbol, creating a new symbol instead. This fixes https://github.com/google/googletest/issues/1207.
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-041-1/+1
| |\ \ | | |/
| | * Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-271-1/+1
| | |
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-242-5/+2
| |\ \ | | |/
| | * Merge branch 'master' into masterrefs/pull/1249/headGennadiy Civil2017-09-231-4/+0
| | |\
| | | * Revert "Allow macros inside of parametrized test names."refs/pull/1271/headGennadiy Civil2017-09-212-15/+9
| | | |
| | | * Merge pull request #1245 from sheepmaster/2017_09_04_parametrizedGennadiy Civil2017-09-212-9/+15
| | | |\ | | | | | | | | | | Allow macros inside of parametrized test names.
| | | | * Allow macros inside of parametrized test names.Bernhard Bauer2017-09-042-9/+15
| | | | | | | | | | | | | | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling.
| | | * | Remove redundant declarationrefs/pull/1265/headBenjamin Kircher2017-09-161-4/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | TempDir() function is declared twice, once in `internal/gtest-port.h` and a second time in `gtest.h`. Fixes a warning with GCC when -Wredundant-decls is given.