summaryrefslogtreecommitdiffstats
path: root/googlemock/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-281-1/+1
|\
| * Add function name to exception if there's no default actionMaurice Gilden2017-08-161-1/+1
| |
* | Handling invalid flag valuesAlyssa Wilk2017-08-161-1/+8
| |
* | Adding a flag option to change the default mock typeAlyssa Wilk2017-08-102-2/+25
|/
* Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-021-1/+1
|\ | | | | remove duplicated words
| * remove duplicated wordsrefs/pull/764/headLi Peng2016-04-271-1/+1
| | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
* | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-154-14/+11
|/ | | | | | | | | 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.
* Fix link that's returned when running tests. #714refs/pull/715/headJacob Meacham2016-02-171-2/+2
|
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-257-0/+1935