Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | cleanup, merges | Gennadiy Civil | 2018-02-13 | 3 | -26/+34 | |
| | | | ||||||
* | | | cleanup/merges | Gennadiy Civil | 2018-02-13 | 2 | -5/+8 | |
| | | | ||||||
* | | | merging | Gennadiy Civil | 2018-02-09 | 1 | -2/+0 | |
| | | | ||||||
* | | | merges | Gennadiy Civil | 2018-02-09 | 1 | -11/+40 | |
| | | | ||||||
* | | | Merge branch 'master' into assert | Gennadiy Civil | 2018-02-09 | 2 | -14/+15 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #1446 from tholsapp/master | Gennadiy Civil | 2018-02-09 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Fixed typos | |||||
| | * | | | Fixed typos | Troy Holsapple | 2018-02-07 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | merges | Gennadiy Civil | 2018-02-09 | 1 | -13/+14 | |
| |/ / / | ||||||
* / / / | Add ability to throw from ASSERT | Alexey Sokolov | 2018-02-08 | 1 | -1/+15 | |
|/ / / | | | | | | | | | | | | | | | | | | | while not losing benefits of EXPECT, and not killing the whole test, as with --gtest_throw_on_failure. 183822976 | |||||
* | | | Merges and also adding new bazel build mode | Gennadiy Civil | 2018-01-31 | 1 | -1/+2 | |
| | | | ||||||
* | | | Code merges | Gennadiy Civil | 2018-01-30 | 1 | -15/+57 | |
| | | | ||||||
* | | | Ability to optionally depend on Abseil plus upstream of 183716547 | Gennadiy Civil | 2018-01-30 | 1 | -0/+28 | |
|/ / | ||||||
* / | upstream cl 182543808 | Gennadiy Civil | 2018-01-24 | 1 | -0/+3 | |
|/ | ||||||
* | Merge branch 'master' into win-libcxx | 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_xboxone | 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-17 | 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 compile | 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, etc | Gennadiy Civil | 2018-01-11 | 1 | -4/+4 | |
|/ | ||||||
* | Upstream cl 103120214 | Gennadiy Civil | 2018-01-11 | 2 | -4/+31 | |
| | ||||||
* | More merge, cleanup | 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 | |
| | ||||||
* | revert | 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-09 | 1 | -1/+1 | |
| | ||||||
* | Upstream of cl 129104714 | 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-declarations | Gennadiy Civil | 2018-01-04 | 1 | -1/+1 | |
|\ | ||||||
| * | Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl. | 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 uintptr | Gennadiy Civil | 2018-01-02 | 10 | -76/+76 | |
|\| | ||||||
| * | Avoid warning C4619 in MSVC 2017. | 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() | 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.pump | 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 VS2017 | Wojciech Mamrak | 2017-12-07 | 1 | -0/+3 | |
| | | |