summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/internal
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-272-49/+85
| |\ \
| * | | 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.
* | | Switch default death test style back to "fast".refs/pull/1464/headVictor Costan2018-02-271-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 enumAnders Sundman (asum)2018-02-231-1/+1
| |
* | cleanup, mergesGennadiy Civil2018-02-133-26/+34
| |
* | mergingrefs/pull/1449/headGennadiy Civil2018-02-091-2/+0
| |
* | mergesGennadiy Civil2018-02-091-11/+40
| |
* | Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-091-1/+1
|\ \ | | | | | | Fixed typos
| * | Fixed typosrefs/pull/1446/headTroy Holsapple2018-02-081-1/+1
| |/
* | mergesrefs/pull/1448/headGennadiy Civil2018-02-091-13/+14
|/
* Merge branch 'master' into win-libcxxrefs/pull/1410/headGennadiy Civil2018-01-231-0/+3
|\
| * Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-181-47/+4
| |\
| * | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-0/+3
| | |
* | | Merge branch 'master' into win-libcxxGennadiy Civil2018-01-181-43/+0
|\ \ \ | | |/ | |/|
| * | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-171-43/+0
| | |
* | | 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.
* | continue upstream/merge, etcrefs/pull/1400/headGennadiy Civil2018-01-111-4/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-111-3/+25
|
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-102-37/+37
|
* revertrefs/pull/1396/headGennadiy Civil2018-01-101-68/+9
|
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
|
* Upstream of cl 129104714refs/pull/1394/headGennadiy Civil2018-01-091-47/+0
|
* wip, cleanups/mergeGennadiy Civil2018-01-091-2/+1
|
* cleanup, mergeGennadiy Civil2018-01-093-2/+4
|
* 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.
* 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 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-241-4/+0
|\ \ | |/
| * 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.
* | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-044-32/+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-141-2/+3
| |\ | | | | | | enable null detection on Solaris Studio 12u4+
| | * enable null detection on Solaris Studio 12u4+refs/pull/905/headiignatev2016-10-171-2/+3
| | |
| * | Merge pull request #937 from srz-zumix/fix-gtest-port-typoGennadiy Civil2017-08-111-1/+1
| |\ \ | | | | | | | | Fix or condition typo ( '|' -> '||' )
| | * | Fix or condition typo ( '|' -> '||' )refs/pull/937/headsrz_zumix2016-11-111-1/+1
| | | |
* | | | Infinite Loop when calling a mock function that takes ↵drgler2017-08-092-0/+31
|/ / / | | | | | | | | | boost::filesystem::path as parameter #521: Add is_same type trait and prevent infinite loops for recursive containers
* | | Merge pull request #1081 from krytarowski/netbsd-1Billy Donahue2017-06-232-2/+5
|\ \ \ | | | | | | | | Add NetBSD support
| * | | Add NetBSD supportrefs/pull/1081/headKamil 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
| | | |
* | | | Changes add ability to overwrite TempDir(), issue ↵refs/pull/1096/headGennadiy Civil2017-05-181-0/+4
| | | | | | | | | | | | | | | | https://github.com/google/googletest/issues/1093
* | | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-152-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2025-04-12 05:02:32 (GMT)