Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | upstream cl 182543808 | Gennadiy Civil | 2018-01-24 | 1 | -0/+3 | |
|/ | ||||||
* | Merge branch 'master' into win-libcxxrefs/pull/1410/head | Gennadiy Civil | 2018-01-23 | 2 | -4/+10 | |
|\ | ||||||
| * | merges, cl/155419551 and other | Gennadiy Civil | 2018-01-22 | 1 | -4/+7 | |
| | | ||||||
| * | Merge branch 'master' into support_xboxonerefs/pull/1401/head | Gennadiy Civil | 2018-01-18 | 3 | -72/+82 | |
| |\ | ||||||
| * | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne | gpetit | 2018-01-12 | 1 | -0/+3 | |
| | | | ||||||
* | | | Merge branch 'master' into win-libcxx | Gennadiy Civil | 2018-01-18 | 2 | -45/+53 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Expose ScopedTrace utility in public interface | Fedor Trushkin | 2018-01-17 | 2 | -45/+53 | |
| | | | ||||||
* | | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under ↵ | Peter Collingbourne | 2018-01-18 | 1 | -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/head | Gennadiy Civil | 2018-01-15 | 1 | -1/+1 | |
| | | ||||||
* | | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -2/+3 | |
| | | ||||||
* | | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -1/+0 | |
| | | ||||||
* | | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -4/+1 | |
| | | ||||||
* | | More code merges | Gennadiy Civil | 2018-01-15 | 1 | -18/+15 | |
| | | ||||||
* | | Code merging | Gennadiy Civil | 2018-01-15 | 2 | -8/+16 | |
| | | ||||||
* | | continue upstream/merge, etcrefs/pull/1400/head | Gennadiy Civil | 2018-01-11 | 1 | -4/+4 | |
|/ | ||||||
* | Upstream cl 103120214 | Gennadiy Civil | 2018-01-11 | 2 | -4/+31 | |
| | ||||||
* | More merge, cleanuprefs/pull/1398/head | Gennadiy Civil | 2018-01-10 | 1 | -1/+1 | |
| | ||||||
* | More merge, cleanup | Gennadiy Civil | 2018-01-10 | 1 | -2/+1 | |
| | ||||||
* | Code merge, upstreaming accumulated changes, cleanup | Gennadiy Civil | 2018-01-10 | 5 | -59/+62 | |
| | ||||||
* | revertrefs/pull/1396/head | Gennadiy Civil | 2018-01-10 | 1 | -68/+9 | |
| | ||||||
* | code merges, cleanup | Gennadiy Civil | 2018-01-10 | 2 | -11/+70 | |
| | ||||||
* | code merge, cleanups | Gennadiy Civil | 2018-01-10 | 1 | -1/+1 | |
| | ||||||
* | Upstream of cl 129104714refs/pull/1394/head | Gennadiy Civil | 2018-01-09 | 2 | -49/+50 | |
| | ||||||
* | Revert one file | Gennadiy Civil | 2018-01-09 | 1 | -2/+3 | |
| | ||||||
* | wip, cleanups/merge | Gennadiy Civil | 2018-01-09 | 2 | -5/+3 | |
| | ||||||
* | cleanup, merge | Gennadiy Civil | 2018-01-09 | 3 | -2/+4 | |
| | ||||||
* | Merge branch 'master' into missing-declarationsrefs/pull/1007/head | Gennadiy Civil | 2018-01-05 | 1 | -1/+1 | |
|\ | ||||||
| * | Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.refs/pull/1377/head | David Benjamin | 2018-01-03 | 1 | -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 Benjamin | 2018-01-03 | 2 | -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-msvc | Gennadiy Civil | 2018-01-03 | 1 | -1/+1 | |
|\ | | | | | Fix testing::Combine on MSVC 2017. | |||||
| * | Fix testing::Combine on MSVC 2017. | David Benjamin | 2018-01-02 | 1 | -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/head | Gennadiy Civil | 2018-01-02 | 10 | -76/+76 | |
|\ \ | |/ | ||||||
| * | Avoid warning C4619 in MSVC 2017.refs/pull/1109/head | David Benjamin | 2017-12-25 | 1 | -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/head | Gregory Pakosz | 2017-12-21 | 1 | -2/+0 | |
| | | | | | | | | | | C4389 was inhibited in commit 4b83461 making behavior inconsistent with other compilers. | |||||
| * | Update gtest-param-test.h.pumprefs/pull/1248/head | Gennadiy Civil | 2017-12-19 | 1 | -3/+0 | |
| | | ||||||
| * | Update gtest-param-test.h.pump | Gennadiy Civil | 2017-12-19 | 1 | -0/+3 | |
| | | ||||||
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-09 | 1 | -0/+3 | |
| |\ | ||||||
| | * | Remove C4996 warning in VS2017refs/pull/1348/head | Wojciech Mamrak | 2017-12-07 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-11-07 | 1 | -5/+10 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' into gtestapifixrefs/pull/1304/head | m-gupta | 2017-10-25 | 1 | -3/+8 | |
| | |\ | ||||||
| | | * | Enable C++11 features for VS2015 and VS2017 | Arkadiy Shapkin | 2017-10-25 | 1 | -3/+8 | |
| | | | | ||||||
| | * | | googletest: Add GTEST_API_ attribute to ThreadLocal class. | Manoj Gupta | 2017-10-20 | 1 | -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_TESTS | Herbert Thielen | 2017-10-04 | 1 | -1/+1 | |
| |\ \ | | |/ | ||||||
| | * | Use gender-neutral pronouns in comments and docsrefs/pull/1275/head | Jonathan Wakely | 2017-09-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-24 | 2 | -5/+2 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' into masterrefs/pull/1249/head | Gennadiy Civil | 2017-09-23 | 1 | -4/+0 | |
| | |\ | ||||||
| | | * | Revert "Allow macros inside of parametrized test names."refs/pull/1271/head | Gennadiy Civil | 2017-09-21 | 2 | -15/+9 | |
| | | | | ||||||
| | | * | Merge pull request #1245 from sheepmaster/2017_09_04_parametrized | Gennadiy Civil | 2017-09-21 | 2 | -9/+15 | |
| | | |\ | | | | | | | | | | | Allow macros inside of parametrized test names. | |||||
| | | | * | Allow macros inside of parametrized test names. | Bernhard Bauer | 2017-09-04 | 2 | -9/+15 | |
| | | | | | | | | | | | | | | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling. | |||||
| | | * | | Remove redundant declarationrefs/pull/1265/head | Benjamin Kircher | 2017-09-16 | 1 | -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. |