Commit Graph

813 Commits

Author SHA1 Message Date
Billy Donahue
26effd4ac9 Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki 2015-08-25 13:29:00 -04:00
Google Code Exporter
c3d8269e34 Migrating wiki contents from Google Code 2015-08-24 18:41:02 -04:00
Billy Donahue
c80449247c Merge pull request #506 from google/BillyDonahue-patch-1
Update README.md
2015-08-24 16:35:19 -04:00
Billy Donahue
09011c446d Update README.md 2015-08-24 16:34:07 -04:00
Billy Donahue
dd766fb970 Merge pull request #505 from BillyDonahue/import_d
Import dhood
2015-08-24 13:53:48 -04:00
Billy Donahue
72d4ca6685 dhood suggestions 2015-08-24 13:36:02 -04:00
Billy Donahue
6e981455c3 Merge pull request #7 from dhood/master
Accept dhood's readme improvement
2015-08-24 12:34:21 -04:00
Deanna Hood
7f57200362 Correct readme links 2015-08-24 14:49:37 +02:00
Billy Donahue
5be21f854a Merge pull request #502 from BillyDonahue/pump_manual_fix
Update PumpManual.md
2015-08-22 18:42:32 -04:00
Billy Donahue
c9bb347f2f Merge pull request #5 from BillyDonahue/pump_manual_fix
Update PumpManual.md
2015-08-22 18:41:41 -04:00
Billy Donahue
0075a69b4c Update PumpManual.md 2015-08-22 18:41:22 -04:00
Billy Donahue
3b029de086 Merge pull request #501 from BillyDonahue/master
integrate doc fixes
2015-08-22 18:38:16 -04:00
Billy Donahue
c869561d1c Merge pull request #4 from BillyDonahue/samples_md-fix
relative links to samples/
2015-08-22 18:37:13 -04:00
Billy Donahue
f26deb26d1 relative links to samples/ 2015-08-22 18:36:16 -04:00
Billy Donahue
35a6cbf3e4 Merge pull request #3 from google/master
Merge pull request #500 from BillyDonahue/master
2015-08-22 18:03:59 -04:00
Billy Donahue
35ffecabcb Merge pull request #500 from BillyDonahue/master
Merge pull request #2 from google/master
2015-08-22 18:02:51 -04:00
Billy Donahue
a3de8e8bf7 Merge pull request #2 from google/master
pull from google master.
2015-08-22 17:58:37 -04:00
Billy Donahue
95548d3ec8 Merge pull request #499 from google/wiki
merge wiki branch into master
2015-08-22 17:39:37 -04:00
Billy Donahue
3003e787a5 Merge pull request #498 from BillyDonahue/wiki
Bring googlecode wiki markdown files into docs/ folder.
2015-08-22 17:37:27 -04:00
Billy Donahue
613e23a4bf Move wiki .md files to docs/ folder. 2015-08-22 17:35:22 -04:00
Billy Donahue
6698939b32 Merge branch 'master' into wiki 2015-08-22 17:31:55 -04:00
Billy Donahue
5050d9680b Merge pull request #1 from google/master
update to google/googletest master
2015-08-22 17:31:23 -04:00
Billy Donahue
e6ad956e00 Merge branch 'wiki' of github.com:BillyDonahue/googletest into wiki 2015-08-22 17:27:48 -04:00
Billy Donahue
b45583ace0 Merge pull request #497 from BillyDonahue/20150822_readme_md
Rename README->README.md
2015-08-22 16:01:19 -04:00
Billy Donahue
a47310a1c1 Rename README->README.md 2015-08-22 15:59:01 -04:00
Billy Donahue
849f281395 Merge pull request #495 from BillyDonahue/script_export
Initial sync from open_gtest_branch to github.
2015-08-21 15:33:25 -04:00
Billy Donahue
524958b444 Remove execute permissions from msvc/ files. 2015-08-21 14:31:06 -04:00
Billy Donahue
98f62c9cdd Codegear files should be CRLF. 2015-08-21 14:16:55 -04:00
Billy Donahue
02730de6e3 Exported by script 2015-08-21 13:49:44 -04:00
Google Code Exporter
642acbd612 Migrating wiki contents from Google Code 2015-07-28 11:15:35 -04:00
kosak
6e1087218b Rename custom/callback-actions.h[.pump] =>
custom/gmock-generated-actions.h[.pump].
2015-07-28 00:53:13 +00:00
kosak
6f8a66431c Introduce FormatForComparison to format values that are operands of comparison assertions (e.g. ASSERT_EQ). 2015-07-28 00:39:46 +00:00
kosak
01db9d469b Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_ 2015-07-28 00:24:28 +00:00
kosak
0b10cfd582 Prevent MSVC from issuing warnings about possible value truncations. 2015-07-28 00:15:20 +00:00
kosak
e83085aeb1 Inject a mock stack trace getter. 2015-07-28 00:12:51 +00:00
kosak
58a4bb42c8 Add an injection point for customizing GMOCK_DECLARE_bool and the like. 2015-07-28 00:02:21 +00:00
kosak
cac6c1bb53 Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_.
Pull in gtest 744.
2015-07-27 23:51:16 +00:00
kosak
f253efc20e Introduct GTEST_HAS_STD_SHARED_PTR_ 2015-07-27 23:49:18 +00:00
kosak
6702b97d5e Inject customization point for gmock-matchers.h 2015-07-27 23:05:57 +00:00
kosak
c820efcc04 Templatize ParseeGoogleMockStringFlag on String type. 2015-07-27 22:08:34 +00:00
kosak
3330752941 Order the initializers correctly. 2015-07-27 22:00:58 +00:00
kosak
1e86cae1d6 Inject GTEST_EXTRA_DEATH_TEST_CHILD_SETUP 2015-07-27 21:42:24 +00:00
kosak
c33ce7c159 Inject the custom InitGoogleTest function using a macro. 2015-07-27 21:36:08 +00:00
kosak
f487e9510b Inject the name of the Init function using a macro. 2015-07-27 21:18:24 +00:00
kosak
37a8c1068d Missing diff that should have gone along with the pull of gtest 738. 2015-07-27 20:52:35 +00:00
kosak
4188ec3529 Inject GTEST_CUSTOM_TEST_EVENT_LISTENER_ 2015-07-24 21:16:59 +00:00
kosak
f972f1680a Inject GetArgvs() with a macro from custom/gtest-port.h. 2015-07-24 20:43:09 +00:00
kosak
40bba6c9ec Inject GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_ 2015-07-24 20:26:10 +00:00
kosak
01e229bacf Fix an instance of move-pessimization. 2015-07-24 20:12:16 +00:00
kosak
a6e32f0a2c Explicitly specify return value for lambda in AsStdFunction() to ensure it
works properly where return type is a reference.
2015-07-24 20:05:26 +00:00