aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
* | | | | Merge pull request #1089 from nico/stdstringBilly Donahue2017-05-164-20/+19
|\ \ \ \ \ | | | | | | | | | | | | Use std::string and ::string explicitly in gtest and gmock code.
| * | | | | Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-154-20/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.
* | | | | Merge pull request #1090 from nico/typoBilly Donahue2017-05-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixing typo in documentation.
| * | | | | Fixing typo in documentation.Nico Weber2017-05-151-1/+1
| |/ / / / | | | | | | | | | | | | | | | This upstreams a Google-internal change.
* / / / / Gender-neutralize comments in gtest.h.Nico Weber2017-05-151-1/+1
|/ / / / | | | | | | | | | | | | This merges a Google-internal change.
* | | | Merge pull request #1078 from pwnall/gtest_api_portBilly Donahue2017-05-102-1/+11
|\ \ \ \ | | | | | | | | | | Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
| * | | | Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.Victor Costan2017-05-042-1/+11
| |/ / / | | | | | | | | | | | | | | | | This makes it possible for a port to define the specifier used for exported symbols without having to change Google Test.
* | | | Merge pull request #965 from davidben/format-attrBilly Donahue2017-05-071-0/+17
|\ \ \ \ | |/ / / |/| | | Annotate ColoredPrintf with the format attribute and fix bugs.
| * | | Annotate ColoredPrintf with the format attribute and fix bugs.David Benjamin2016-12-211-0/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | googletest doesn't currently build with clang's very aggressive -Wformat-nonliteral warning. It requires that all non-literal format strings come from the argument of a function annotated with a compatible format attribute. Fixing that reports that ColoredPrintf's callers weren't passing the normal -Wformat warning. Some messages were passed directly into the format string rather than via "%s".
* | | Merge pull request #1034 from dankegel/masterBilly Donahue2017-05-021-1/+1
|\ \ \ | | | | | | | | Minimal changes to fix build failures on Microsoft Visual Studio 2015
| * | | Minimal changes to fix build failures on Microsoft Visual Studio 2015Dan Kegel2017-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following errors: hash_map(17): error C2338: <hash_map> is deprecated and will be REMOVED. Please use <unordered_map>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj] hash_set(17): error C2338: <hash_set> is deprecated and will be REMOVED. Please use <unordered_set>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj] googletest\test\gtest_catch_exceptions_test_.cc(152): error C2220: warning treated as error - no 'object' file generated googletest\test\gtest_catch_exceptions_test_.cc(152): warning C4297: 'CxxExceptionInDestructorTest::~CxxExceptionInDestructorTest': function assumed not to throw an exception but does googletest\test\gtest_catch_exceptions_test_.cc(152): note: destructor or deallocator has a (possibly implicit) non-throwing exception specification There were already some checks for _MSC_VER in the code, so this commit continues in that vein.
* | | | Changes to make TempDir() publicGennadiy Civil2017-05-022-3/+9
|/ / / | | | | | | | | | Fixes #1076.
* | | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/srz_zumix2017-02-031-1/+1
| | |
* | | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_PMike Bjorge2017-01-091-3/+4
|/ / | | | | | | | | | | If REGISTER_TYPED_TEST_CASE_P is included in a header file, but the .cc file does not declare INSTANTIATE_TYPED_TEST_CASE_P, an unused-variable warning may be raised by the compiler.
* | Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONEBilly Donahue2016-11-031-2/+6
|\ \ | |/ |/| Fix detection of GTEST_HAS_CLONE for Android.
| * Fix detection of GTEST_HAS_CLONE for Android.Dan Albert2016-11-011-2/+6
| | | | | | | | | | This was not in Gingerbread for anything but ARM (even though the libs were hacked to lie about it being available in gingerbread).
* | Fix build with MinGW-w64Arkadiy Shapkin2016-09-051-1/+1
| |
* | Merge pull request #721 from ilmagico/fix-mingw-threadsBilly Donahue2016-08-241-3/+9
|\ \ | | | | | | Fix compilation of googletest with MinGW using Win32 threads
| * | Fix compilation on MinGW with native threadsDaniele Tamino2016-02-221-3/+9
| |/
* | Rollback change #808.Billy Donahue2016-06-261-2/+2
| |
* | Fix to tests that return object which implement operator boolDavid Mott2016-06-251-2/+2
| |