summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest
Commit message (Collapse)AuthorAgeFilesLines
...
* More merge, cleanupGennadiy Civil2018-01-101-2/+1
|
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
|
* revertGennadiy Civil2018-01-101-68/+9
|
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
|
* code merge, cleanupsGennadiy Civil2018-01-091-1/+1
|
* Upstream of cl 129104714Gennadiy 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-declarationsGennadiy Civil2018-01-041-1/+1
|\
| * Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.David 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 uintptrGennadiy Civil2018-01-0210-76/+76
|\|
| * Avoid warning C4619 in MSVC 2017.David 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()Gregory Pakosz2017-12-211-2/+0
| | | | | | | | | | C4389 was inhibited in commit 4b83461 making behavior inconsistent with other compilers.
| * Update gtest-param-test.h.pumpGennadiy 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 VS2017Wojciech 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 gtestapifixm-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 docsJonathan 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 masterGennadiy Civil2017-09-231-4/+0
| | |\
| | | * Revert "Allow macros inside of parametrized test names."Gennadiy 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 declarationBenjamin 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.
| | * | Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
| | | | | | | | | | | | | | | | Swap reinterpret_cast for static_cast
| | * | add a castStepan Khapugin2017-09-051-1/+2
| | |/
| * / remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-047-50/+4
| |/ | | | | | | | | | | | | | | As mentioned in issue #360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." https://github.com/google/googletest/issues/360
| * Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIAScott Graham2017-08-292-2/+6
| |
| * Merge branch 'master' into masterDaniel Krügler2017-08-211-3/+4
| |\
| | * Merge pull request #905 from iignatev/masterGennadiy Civil2017-08-131-2/+3
| | |\ | | | | | | | | enable null detection on Solaris Studio 12u4+
| | | * enable null detection on Solaris Studio 12u4+iignatev2016-10-171-2/+3
| | | |
| | * | Merge pull request #937 from srz-zumix/fix-gtest-port-typoGennadiy Civil2017-08-101-1/+1
| | |\ \ | | | | | | | | | | Fix or condition typo ( '|' -> '||' )
| | | * | Fix or condition typo ( '|' -> '||' )srz_zumix2016-11-111-1/+1
| | | | |
| * | | | Infinite Loop when calling a mock function that takes ↵drgler2017-08-093-8/+42
| |/ / / | | | | | | | | | | | | boost::filesystem::path as parameter #521: Add is_same type trait and prevent infinite loops for recursive containers
* / / / Pass MSVC's C4826 warning.David Benjamin2017-08-071-7/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | MSVC has an optional warning which flags when 32-bit pointers get cast into a 64-bit value. This is a little overaggressive I think, but to ease compiling in projects with aggressive warnings, fix this by just casting to const void * directly. Modern GCCs seem to compile it just fine.
* | | Merge pull request #1081 from krytarowski/netbsd-1Billy Donahue2017-06-232-2/+5
|\ \ \ | | | | | | | | Add NetBSD support
| * | | Add NetBSD supportKamil Rytarowski2017-05-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | NetBSD is a modern UNIX-like Operating System. Enable GTEST_HAS_PTHREAD and GTEST_HAS_DEATH_TEST on NetBSD.
* | | | Create gtest-internal.hBilly Donahue2017-06-111-1/+1
| | | |
* | | | Merge pull request #1091 from nico/wmicroBilly Donahue2017-05-231-38/+51
|\ \ \ \ | | | | | | | | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
| * | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.Nico Weber2017-05-151-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change. Original CL description: The C++ standard says that function pointers are not implicitly convertible to object pointers. Visual Studio disregards that and allows implicit conversion between function pointers and object points, and enough code relies on this that clang follows suit in Microsoft-compatibility mode. However, clang emits a -Wmicrosoft-cast warning when such a conversion is done: E:\b\c\b\win_clang\src\sandbox\win\src\sync_dispatcher.cc(42,7): warning: implicit conversion between pointer-to-function and pointer-to-object is a Microsoft extension [-Wmicrosoft-cast] This change fixes this warning in gtest, while hopefully not changing any behavior. The change does two things: 1. It replaces the if in DefaultPrintTo with SFINAE 2. In C++11 mode, it uses enable_if<is_function<>> instead of ImplicitlyConvertible<T*, const void*> to check if the explicit cast is needed. With this change, functions will use the branch with the reintpret_casts with Visual Studio and clang/win, and clang no longer needs to warn that it implicitly converts a function pointer to a void pointer.
* | | | | Changes add ability to overwrite TempDir(), issue ↵Gennadiy Civil2017-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | https://github.com/google/googletest/issues/1093
OpenPOWER on IntegriCloud