aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-052-0/+6
|\
| * Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-015-123/+465
| |\
| * | Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-232-0/+6
| | |
* | | Merges-1Gennadiy Civil2018-03-052-4/+5
| |/ |/|
* | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest ↵Xiaoyi Zhang2018-02-273-123/+328
|\ \ | | | | | | | | | into variant_matcher
| * \ Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-273-123/+328
| |\ \
| | * | gmock merging -2Gennadiy Civil2018-02-273-123/+328
| | |/
* | / Add documentation for VariantWith.Xiaoyi Zhang2018-02-271-0/+2
|/ /
* / Add matcher for std::variant.Xiaoyi Zhang2018-02-272-0/+135
|/
* moving JoinAsTuple to internalGennadiy Civil2018-02-124-49/+22
|
* Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-095-13/+13
|\ | | | | Fixed typos
| * Fixed typosTroy Holsapple2018-02-075-13/+13
| |
* | mergesGennadiy Civil2018-02-092-8/+11
|/
* Adding tests to googlemock bazelGennadiy Civil2018-01-262-6/+72
|
* Code mergesGennadiy Civil2018-01-269-34/+86
|
* Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-0910-187/+18
|\
| * [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcLoo Rong Jie2018-01-091-1/+2
| | | | | | | | and x64_windows_msvc
| * Merge branch 'master' into missing-declarationsGennadiy Civil2018-01-042-9/+1
| |\
| | * Merge branch 'master' into masterGennadiy Civil2018-01-041-1/+1
| | |\
| | | * Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-221-5/+5
| | | |\
| | | * \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-155-167/+5
| | | |\ \
| | | * \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-081-0/+2
| | | |\ \ \
| | | * | | | Run autoconf from top-level directory.Carlos O'Ryan2017-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-8/+0
| | | |_|_|/ | | |/| | |
| * / | | | Pass the -Wmissing-declarations warning.David Benjamin2018-01-033-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into masterbryanzim2017-12-153-165/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into ↵Carlos O'Ryan2017-12-111-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | fix-top-level-license
| | * | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-113-165/+1
| | | | | | | | | | | | | | | | | | | | | | | | Per the review comments.
| * | | | | remove extra lineBryan Zimmerman2017-12-111-1/+0
| | | | | |
| * | | | | remove implicit castsBryan Zimmerman2017-12-111-5/+4
| | | | | |
| * | | | | Merge branch 'master' into masterbryanzim2017-12-111-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-082-0/+4
| | |\| | |
| | * | | | make includes systemSam Lunt2017-11-271-2/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'master' into masterbryanzim2017-12-081-0/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add licenses() directive for googlemock/tests.Carlos O'Ryan2017-12-081-0/+2
| | | |/ | | |/| | | | | | | | | | | | | Without the directive embedding googletest into third_party breaks any //... target.
| * | | Merge branch 'master' into masterbryanzim2017-12-081-1/+2
| |\| |
| * | | fix for VS2017 deprecation of ::tr1::tupleBryan Zimmerman2017-10-272-9/+12
| | |/ | |/| | | | | | | | | | change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces
* | | Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2017-12-081-0/+2
|\ \ \ | | |/ | |/|
| * | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| |/
* / Fix double free when building Gtest/GMock in shared libraries and linking a ↵Romain Geissler2017-12-021-23/+40
|/ | | | test executable with both.
* Remove gcc 6 misleading indentations.Romain Geissler2017-10-252-13/+26
|
* Fix gmock tests when std::unary_function unavailableArkady Shapkin2017-10-251-2/+5
|
* Fix tests with VS2015 and VS2017Arkadiy Shapkin2017-10-252-4/+9
|
* #1282: Doc typo fixDariusz Ostolski2017-10-141-1/+1
|
* Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-278-9/+9
|
* Fix ellipsis position in examplesAlex Yursha2017-09-081-8/+16
|
* Merge pull request #975 from LebedevRI/respect-optionGennadiy Civil2017-09-051-1/+1
|\ | | | | CMake: use threads if allowed and found, not just if found.
| * CMake: use threads if allowed and found, not just if found.Roman Lebedev2017-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user's cmakelists.txt first look for threads using find_package(Threads), then set(gtest_disable_pthreads ON), and then include googletest. GoogleTest will not look for threads. But since they have already been found before in user's cmakelists, it will use them regardless. This helped me fix build issue in darktable-org/rawspeed on windows/MSYS2, even though there are threads, and they are usable, googletest build was failing with issues about AutoHandle. I was first looking for threads, and only then including googletest, so no matter the value of gtest_disable_pthreads, it failed. The other obvious solution is for user to first include googletest, and only then look for threads by himself.
* | Merge pull request #900 from Gallaecio/patch-1Gennadiy Civil2017-09-011-1/+1
|\ \ | |/ |/| Fix WhenSorted() documentation example
| * Fix WhenSorted() documentation exampleGallaecio2016-10-081-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 11:31:41 +0000