aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Added googlemock testsmisterg2017-08-091-0/+29
| | | | | | |
* | | | | | | Handling invalid flag valuesAlyssa Wilk2017-08-162-1/+28
| | | | | | |
* | | | | | | Adding a flag option to change the default mock typeAlyssa Wilk2017-08-106-3/+102
|/ / / / / /
* | | | | | Merge pull request #1123 from chromy/upstream-141765019Gennadiy Civil2017-08-081-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in gmock-actions.h
| * | | | | | Fix typo in gmock-actions.hHector Dearman2017-06-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change (141765019).
* | | | | | | Merge pull request #1122 from chromy/upstream-146491438Gennadiy Civil2017-08-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed misspelling in assertion message.
| * | | | | | | Fixed misspelling in assertion message.Hector Dearman2017-06-191-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change (146491438).
* | | | | | | Correct some typos in a commentShlomi Fish2017-08-041-1/+1
| | | | | | |
* | | | | | | Merge pull request #1042 from danilcha/patch-1Gennadiy Civil2017-08-021-3/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added description of how to silence clang pedantic warnings in Google Mock includes
| * | | | | | | Again rewrote everythingdanilcha2017-03-121-12/+24
| | | | | | | |
| * | | | | | | Added explicit gtest library dependencydanilcha2017-03-121-1/+1
| | | | | | | |
| * | | | | | | Update README.mddanilcha2017-03-111-2/+2
| | | | | | | |
| * | | | | | | Update README.mddanilcha2017-03-111-3/+24
| | | | | | | |
* | | | | | | | Merge pull request #867 from marzojr/patch-1Gennadiy Civil2017-08-021-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clarifying documentation language
| * | | | | | | | Clarifying languageMarzo Sette Torres Junior2016-09-021-2/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | The old language might mislead someone into thinking that the access level on the base class itself was changed.
* | | | | | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-023-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove duplicated words
| * | | | | | | | remove duplicated wordsLi Peng2016-04-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
* | | | | | | | | Merge pull request #998 from dawikur/patch-1Gennadiy Civil2017-08-021-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Replace html entities with their equivalents
| * | | | | | | | Replace html entities with their equivalentsDawid Kurek2017-02-061-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #1167 from krizalys/fix-typoGennadiy Civil2017-07-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed typo
| * | | | | | | | Fixed typoChristophe Vidal2017-07-311-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* / | | | | | | fix links to Google C++ Style GuideHerbert Thielen2017-07-302-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #1137 from coryan/masterGennadiy Civil2017-07-264-29/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix table formatting.
| * | | | | | | More tables that did not render correctly.Carlos O'Ryan2017-07-014-1/+9
| | | | | | | |
| * | | | | | | Remove silly claim that C++ lacks lambdas.Carlos O'Ryan2017-07-014-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The document itself uses lambdas later, all the scaffolding to work around lack of lambdas should be considered for removal, but that is much larger an effort than I can commit to.
| * | | | | | | Same fixes for "current" version.Carlos O'Ryan2017-07-011-4/+5
| | | | | | | |
| * | | | | | | Fix typos too s/destoyed/destroyed/Carlos O'Ryan2017-07-013-6/+6
| | | | | | | |
| * | | | | | | Fix table formatting.Carlos O'Ryan2017-07-013-6/+9
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | The markdown was not working for a small table, fixed.
* | | | | | | docs: fix broken linkJose Nino2017-07-261-1/+1
| | | | | | |
* | | | | | | docs: fix broken link from dummies guide to cook bookJose Nino2017-06-191-1/+1
|/ / / / / /
* | | | / / Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-1516-401/+406
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.
* | | | | Remove /tree/ from Readme.md links.Billy Donahue2017-02-251-4/+4
|/ / / / | | | | | | | | Issue #1028
* | | | Merge pull request #1 from google/masterSam Roth2017-01-233-2/+12
|\ \ \ \ | | | | | | | | | | Syncing my branch
| * \ \ \ Merge pull request #658 from audiofanatic/ExternalProject_at_configure_timeBilly Donahue2016-12-181-0/+10
| |\ \ \ \ | | | | | | | | | | | | Added docs for ExternalProject download during CMake step
| | * | | | Added CMake configure-time download instructions to docsCraig Scott2016-12-181-0/+10
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds instructions for how to add gtest and gmock to another CMake project directly. Downloading of the googletest sources happens as configure time, allowing it to be added to the main build directly via the add_subdirectory() command. This ensures googletest is built with the same compiler settings, etc. and will typically result in a more robust and more convenient build arrangement.
| * / | | 2.6.4 is the minimum CMake version, so enforce it (#656)Craig Scott2016-12-171-1/+1
| |/ / /
| * | / Cookbok: fix broken relative linkMarco Molteni2016-09-131-1/+1
| | |/ | |/|
* | | Fixed broken linksSamuel Roth2016-09-121-1/+1
| | |
* | | blob vs treeSamuel Roth2016-09-121-1/+1
| | |
* | | Fixing relative linksSamuel Roth2016-09-121-2/+2
| | |
* | | Fixing KnownIssues and FrequentlyAskedQuestions linksSamuel Roth2016-09-121-2/+2
| | |
* | | Broken relative links fixedSamuel Roth2016-09-121-6/+6
| | |
* | | Fixing ForDummies linkSamuel Roth2016-09-121-1/+1
| | |
* | | One worksSamuel Roth2016-09-121-1/+1
| | |
* | | Relative linksSamuel Roth2016-09-121-1/+1
| | |
* | | Fixing relative linksSamuel Roth2016-09-121-1/+1
|/ /
* | Reformatted the Unprintable operator== code style.mazong11232016-07-141-1/+4
| |
* | Fixed issue #775mazong11232016-07-141-2/+3
| |
* | Added VS 2015 project support.mazong11232016-05-155-0/+328
| |
* | Updated the value of GTEST_DIR to reflect the googletest dir.mazong11232016-05-151-1/+1
| |