aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| * | | Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffixGennadiy Civil2017-08-111-4/+8
| |\ \ \ | | | | | | | | | | Fix library install destinations
| | * | | Fix library install destinationsMatthew Woehlke2017-08-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify library install destinations to install .dll's to the correct location (`bin`, not `lib`), and to install other artifacts to the correct platform-dependent location by using GNUInstallDirs. This is required for some distributions (e.g. Fedora) and will fix an issue that otherwise requires those distributions to patch the upstream sources. Also, add options to suppress installation, which may be useful for projects that embed Google Test. Since Google Test is trying to support archaic versions of CMake, a brain-dead fallback (which requires that the user set either LIB_SUFFIX or CMAKE_INSTALL_LIBDIR themselves) is included for versions that predate GNUInstallDirs. Fixes #1161. Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
| * | | | Merge pull request #957 from sglass68/simGennadiy Civil2017-08-101-2/+2
| |\ \ \ \ | | | | | | | | | | | | Fix a few documentation nits in the mock dummies guide
| | * | | | Fix a few documentation nits in the mock dummies guideSimon Glass2016-12-081-2/+2
| | | |/ / | | |/| | | | | | | | | | | | Add a hyphen to 'ad hoc' and change 'distance' to plural.
| * | | | Merge pull request #1164 from aninf-wo/hethi/remove-old-docsGennadiy Civil2017-08-1016-14883/+6
| |\ \ \ \ | | | | | | | | | | | | remove documentation of former versions - it's available in the commit history
| | * | | | say "former version" instead of "released version"Herbert Thielen2017-08-101-1/+1
| | | | | |
| | * | | | Merge branch 'master' into hethi/remove-old-docsHerbert Thielen2017-08-099-18/+52
| | |\ \ \ \
| | * | | | | remove doc of former versionsHerbert Thielen2017-07-3015-14880/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of former versions is available in the history (e.g. by checking out the appropriate git tags), so there is no need to keep them in parallel to the current documentation.
| | * | | | | remove obsolete reference to SVN trunk and fix link to pump manualHerbert Thielen2017-07-301-3/+6
| | | | | | |
| * | | | | | Merge pull request #1192 from eduherminio/masterGennadiy Civil2017-08-101-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Minor style fixes
| | * | | | | | Minor style fixesEduardo Caceres2017-08-101-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | Typos, punctuation & broken links
| * | | | | | Merge pull request #1191 from gennadiycivil/masterGennadiy Civil2017-08-101-0/+52
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Adding Bazel build to googletest (initial version )
| | * | | | | Added Copyrightmisterg2017-08-101-4/+31
| | | | | | |
| | * | | | | Initial Revision, review 164634031misterg2017-08-101-25/+0
| | | | | | |
| | * | | | | WIPmisterg2017-08-091-0/+25
| | | | | | |
| | * | | | | Added googlemock testsmisterg2017-08-091-4/+0
| | | | | | |
| | * | | | | 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