summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Collapse)AuthorAgeFilesLines
* code merges, cleanupGennadiy Civil2018-01-103-12/+71
|
* revert googletest/test/gtest-param-test_test.ccrefs/pull/1395/headGennadiy Civil2018-01-101-46/+3
|
* code merge, cleanupsGennadiy Civil2018-01-105-20/+59
|
* Upstream of cl 129104714refs/pull/1394/headGennadiy Civil2018-01-092-49/+50
|
* Revert one fileGennadiy Civil2018-01-091-2/+3
|
* wip, cleanups/mergeGennadiy Civil2018-01-093-5/+3
|
* Merge branch 'master' into masterrefs/pull/1393/headGennadiy Civil2018-01-091-3/+6
|\
| * [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcrefs/pull/1388/headLoo Rong Jie2018-01-091-3/+6
| | | | | | | | and x64_windows_msvc
* | cleanup, mergeGennadiy Civil2018-01-093-2/+4
|/
* Small cleanups, mergerefs/pull/1390/headGennadiy Civil2018-01-082-2/+5
|
* Merge branch 'master' into masterrefs/pull/1385/headGennadiy Civil2018-01-056-43/+51
|\
| * Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-0519-159/+71
| |\
| | * Merge pull request #1377 from davidben/clang-clGennadiy Civil2018-01-051-1/+1
| | |\ | | | | | | | | Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
| | | * 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.
| * | | Pass the -Wmissing-declarations warning.David Benjamin2018-01-035-42/+50
| | |/ | |/| | | | | | | | | | | | | 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.
* | | Revert one file for nowGennadiy Civil2018-01-051-10/+0
| | |
* | | code cleanup in preparation for merges, cl 180857299Gennadiy Civil2018-01-0512-16/+19
| |/ |/|
* | Merge branch 'master' into masterrefs/pull/1378/headGennadiy Civil2018-01-041-30/+59
|\ \
| * \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submodulerefs/pull/1341/headGennadiy Civil2018-01-032-8/+3
| |\ \ | | |/
| * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2018-01-032-2/+10
| |\ \
| * \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-222-10/+8
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1916-112/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-154-168/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-083-1/+9
| |\ \ \ \ \ \
| * | | | | | | Run autoconf from top-level directory.Carlos O'Ryan2017-12-031-30/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part (hopefully all) of the fixes for #776. The top-level configure.ac configures googletest first and then googlemock. With this changes it is possible to embed googletest into another project that uses autoconf. For an example (though it is WIP), see the commits (and soon PR) referenced from google/protobuf#236.
* | | | | | | | upstreaming cl 124976692Gennadiy Civil2018-01-0317-128/+11
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix testing::Combine on MSVC 2017.
| * \ \ \ \ \ \ Merge branch 'master' into tuple-msvcrefs/pull/1374/headGennadiy Civil2018-01-031-2/+6
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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 pull request #991 from davidben/uintptrGennadiy Civil2018-01-031-7/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Pass MSVC's C4826 warning.
| * | | | | | | Merge branch 'master' into uintptrrefs/pull/991/headGennadiy Civil2018-01-02104-13642/+2499
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | 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.
* | | | | | | | OSS Sync, cl 163329677refs/pull/1376/headmisterg2018-01-021-2/+6
| |/ / / / / / |/| | | | | |
* | | | | | | Avoid warning C4619 in MSVC 2017.refs/pull/1109/headDavid 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()refs/pull/778/headGregory Pakosz2017-12-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C4389 was inhibited in commit 4b83461 making behavior inconsistent with other compilers.
* | | | | | Update internal_utils.cmakerefs/pull/1357/headbryanzim2017-12-201-2/+1
| | | | | |
* | | | | | Merge branch 'master' into masterbryanzim2017-12-2016-112/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Update gtest-param-test.h.pumprefs/pull/1248/headGennadiy 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-183-166/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-093-3/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-011-3/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-076-25/+73
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-0412-13/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-248-153/+175
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-083-6/+11
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-0416-112/+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
* | | | | | | | | | | Merge branch 'master' into masterbryanzim2017-12-153-166/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into ↵refs/pull/1354/headCarlos O'Ryan2017-12-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | fix-top-level-license
| * | | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-123-166/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the review comments.
generated by cgit v0.12 at 2025-09-01 06:06:43 (GMT)