summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename custom/callback-actions.h[.pump] =>HEADmasterkosak@google.com2015-07-286-16/+16
| | | | | | | custom/gmock-generated-actions.h[.pump]. git-svn-id: http://googlemock.googlecode.com/svn/trunk@566 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 746.kosak@google.com2015-07-280-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@565 8415998a-534a-0410-bf83-d39667b30386
* Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_kosak@google.com2015-07-281-0/+5
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@564 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 745.kosak@google.com2015-07-280-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@563 8415998a-534a-0410-bf83-d39667b30386
* Inject a mock stack trace getter.kosak@google.com2015-07-281-10/+42
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@562 8415998a-534a-0410-bf83-d39667b30386
* Add an injection point for customizing GMOCK_DECLARE_bool and the like.kosak@google.com2015-07-282-0/+51
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@561 8415998a-534a-0410-bf83-d39667b30386
* Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_.kosak@google.com2015-07-271-0/+18
| | | | | | | Pull in gtest 744. git-svn-id: http://googlemock.googlecode.com/svn/trunk@560 8415998a-534a-0410-bf83-d39667b30386
* Inject customization point for gmock-matchers.hkosak@google.com2015-07-272-1/+43
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@559 8415998a-534a-0410-bf83-d39667b30386
* Templatize ParseeGoogleMockStringFlag on String type.kosak@google.com2015-07-271-1/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@558 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 743.kosak@google.com2015-07-270-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@557 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 742.kosak@google.com2015-07-270-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@556 8415998a-534a-0410-bf83-d39667b30386
* Bring in gtest 741.kosak@google.com2015-07-270-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@555 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 740.kosak@google.com2015-07-270-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@554 8415998a-534a-0410-bf83-d39667b30386
* Missing diff that should have gone along with the pull of gtest 738.kosak@google.com2015-07-271-39/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@553 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 739.kosak@google.com2015-07-240-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@552 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 738.kosak@google.com2015-07-240-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@551 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 737.kosak@google.com2015-07-240-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@550 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 736.kosak@google.com2015-07-240-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@549 8415998a-534a-0410-bf83-d39667b30386
* Explicitly specify return value for lambda in AsStdFunction() to ensure itkosak@google.com2015-07-243-12/+22
| | | | | | | works properly where return type is a reference. git-svn-id: http://googlemock.googlecode.com/svn/trunk@548 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 735.kosak@google.com2015-07-240-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@547 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 734.kosak@google.com2015-07-240-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@546 8415998a-534a-0410-bf83-d39667b30386
* Remove some tests.kosak@google.com2015-07-191-19/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@545 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 733.kosak@google.com2015-07-190-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@544 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 732.kosak@google.com2015-07-190-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@543 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 731.kosak@google.com2015-07-190-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@542 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 730.kosak@google.com2015-07-190-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@541 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 729.kosak@google.com2015-07-190-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@540 8415998a-534a-0410-bf83-d39667b30386
* Move Callback-related generated actions to a custom/ file.kosak@google.com2015-07-195-169/+166
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@539 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 728.kosak@google.com2015-07-170-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@535 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 727.kosak@google.com2015-07-170-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@534 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 726.kosak@google.com2015-07-170-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@533 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 725.kosak@google.com2015-07-170-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@532 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 724.kosak@google.com2015-07-170-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@531 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 723.kosak@google.com2015-07-140-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@530 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 722.kosak@google.com2015-07-140-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@529 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 720.kosak@google.com2015-07-140-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@528 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 718.kosak@google.com2015-07-140-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@527 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 716.kosak@google.com2015-07-140-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@526 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 715.kosak@google.com2015-07-140-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@525 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 714.kosak@google.com2015-07-140-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@524 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 713.kosak@google.com2015-07-130-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@522 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 712.kosak@google.com2015-07-130-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@521 8415998a-534a-0410-bf83-d39667b30386
* Mark the default constructor of Matcher<> explicit.kosak@google.com2015-07-131-1/+1
| | | | | | | This prevents implicitly constructing a matcher from {}. git-svn-id: http://googlemock.googlecode.com/svn/trunk@520 8415998a-534a-0410-bf83-d39667b30386
* Fix EXPECT_THAT() to support literal strings as a second argument.kosak@google.com2015-04-282-3/+19
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@519 8415998a-534a-0410-bf83-d39667b30386
* Change IsNull and NotNull to use ==/!= nullptr in C++11.kosak@google.com2015-04-283-1/+27
| | | | | | | Also update gmock_doctor due to Clang wording change. git-svn-id: http://googlemock.googlecode.com/svn/trunk@518 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 711.kosak@google.com2015-04-280-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@517 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 710.kosak@google.com2015-04-280-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@516 8415998a-534a-0410-bf83-d39667b30386
* Pull in gtest 709.kosak@google.com2015-04-280-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@515 8415998a-534a-0410-bf83-d39667b30386
* Suppresses the stack trace in a warning for uninteresting call by default; ↵kosak@google.com2015-02-143-13/+27
| | | | | | the stack trace will still be printed when --gmock_verbose=info is printed. git-svn-id: http://googlemock.googlecode.com/svn/trunk@514 8415998a-534a-0410-bf83-d39667b30386
* In C++11 and above, makes a mock method whose return type is defaultkosak@google.com2015-02-144-72/+150
| | | | | | | constructible return a default-constructed value by default. git-svn-id: http://googlemock.googlecode.com/svn/trunk@513 8415998a-534a-0410-bf83-d39667b30386
View Lorry Controller Status