aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-221-5/+5
|\
| * Merge branch 'master' into masterbryanzim2017-12-153-165/+1
| |\
| * | 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 masterbryanzim2017-12-081-0/+2
| |\ \ \
| * \ \ \ 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-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-155-167/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into ↵Carlos O'Ryan2017-12-111-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | fix-top-level-license
| | * | | | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-082-0/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | make includes systemSam Lunt2017-11-271-2/+2
| | | |/ / | | |/| |
| * | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-113-165/+1
| | |/ / | |/| | | | | | | | | | Per the review comments.
| * | | 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 fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-081-0/+2
|\| |
| * | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-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.
* 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
| |
* | Merge pull request #1011 from zeitounator/wrong-version-reportedGennadiy Civil2017-09-011-2/+2
|\ \ | | | | | | Wrong version reported (1.7.0 should be 1.8.0)
| * \ Merge branch 'master' into wrong-version-reportedGennadiy Civil2017-08-2143-15316/+604
| |\ \
| * | | googlemock version must be changed as wellOlivier Clavel2017-02-131-2/+2
| | | | | | | | | | | | keep googletest and googlemock versions in sync
* | | | change links from former code.google.com to current github repositoryHerbert Thielen2017-08-317-10/+10
| | | |
* | | | use plural verb as mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
| | | |
* | | | remove Yob's comma mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
| | | |
* | | | Applying lint checks from upstream google3Alyssa Wilk2017-08-281-4/+7
| | | |
* | | | Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-2836-14930/+630
|\ \ \ \
| * | | | Support x64 configuration for old VS2015 projectsArkady Shapkin2017-08-254-7/+216
| | | | |
| * | | | Merge branch 'master' into vs-projects-fixGennadiy Civil2017-08-222-8/+47
| |\ \ \ \
| | * | | | Support ref-qualified member functions in Property().Roman Perepelitsa2017-08-222-8/+47
| | | |/ / | | |/| |
| * / | | Support x64 configuration for old VS2010 projectsArkady Shapkin2017-08-235-22/+237
| |/ / / | | | | | | | | | | | | VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
| * | | Remove unused variableMaurice Gilden2017-08-211-1/+0
| | | |
| * | | Added "explicit" as per compiler suggestionGennadiy Civil2017-08-201-1/+1
| | | |
| * | | Proposing these changes, please reviewGennadiy Civil2017-08-201-12/+9
| | | | | | | | | | | | | | | | Slightly better names and cleaner tests. Please review
| * | | Change tabs to spaces in test caseMaurice Gilden2017-08-181-11/+11
| | | |
| * | | Switch return type to class without default constructorMaurice Gilden2017-08-181-1/+7
| | | |
| * | | Fix test if exceptions are not supportedMaurice Gilden2017-08-181-0/+6
| | | |
| * | | adds test for NiceMock with unknown return valueMaurice Gilden2017-08-181-0/+15
| | | |
| * | | Add function name to exception if there's no default actionMaurice Gilden2017-08-161-1/+1
| | | |
| * | | Add support for pkgconfigDavid Seifert2017-08-143-1/+36
| | | |
| * | | Merge pull request #926 from bartshappee/patch-1Gennadiy Civil2017-08-111-1/+1
| |\ \ \ | | | | | | | | | | Fix small typo in Cookbook: SeArrayArgument
| | * | | Fix small typo SeArrayArgumentbartshappee2016-11-071-1/+1
| | | |/ | | |/| | | | | SeArrayArgument => SetArrayArgument
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 15:16:34 +0000