aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
...
* formattingGennadiy Civil2018-04-051-2/+2
|
* And more MCVS warningsGennadiy Civil2018-04-051-5/+4
|
* fixing MCVS warnGennadiy Civil2018-04-051-0/+10
|
* Have to wait for this oneGennadiy Civil2018-04-051-2/+2
|
* Have to wait for this oneGennadiy Civil2018-04-051-1/+1
|
* Merging matchers testGennadiy Civil2018-04-051-0/+3
|
* Merging matchers testGennadiy Civil2018-04-051-40/+779
|
* bad cut/pasteGennadiy Civil2018-04-041-1/+1
|
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-2/+6
|
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-1/+1
|
* Address MSVC warning C4503, decorated name length exceeded, name was truncatedGennadiy Civil2018-04-041-0/+2
|
* Fixing build break on MSVCGennadiy Civil2018-04-041-1/+1
|
* merging gmock matchers 1Gennadiy Civil2018-04-043-72/+483
|
* merging gmock-matchers.h 3Gennadiy Civil2018-03-261-13/+36
|
* merging gmock-matchers.h 2Gennadiy Civil2018-03-261-7/+44
|
* Upstreaming FloatingEq2Matcher,Gennadiy Civil2018-03-261-9/+13
|
* Merging gmock-matchers.h -2 Gennadiy Civil2018-03-231-29/+208
|
* gmock-matchers merging -2 Gennadiy Civil2018-03-231-10/+250
|
* merging, gmock -1Gennadiy Civil2018-03-224-60/+120
|
* More merges, removing old dead codeGennadiy Civil2018-03-132-7/+8
|
* merges-2Gennadiy Civil2018-03-052-4/+14
|
* 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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 22:44:02 +0000