3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-01 14:57:54 +08:00
Code Issues Projects Releases Wiki Activity
814 Commits 7 Branches 27 Tags 35 MiB
Commit Graph

814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Billy Donahue
a48c4e5e36 cleanup travis.sh 2015-08-31 10:21:58 -04:00
Billy Donahue
e5c7bbae18 remove unused valgrind probe 2015-08-31 10:08:44 -04:00
Billy Donahue
520d30c035 travis update 2015-08-31 09:54:37 -04:00
Billy Donahue
b1b7bd3c08 Merge branch 'master' of github.com:google/googletest into travis 2015-08-31 09:46:11 -04:00
Billy Donahue
604bd64d11 Update README.md 2015-08-31 09:43:03 -04:00
Billy Donahue
7443fb92ef Merge pull request #575 from BillyDonahue/master 
travis continuous integration
 2015-08-31 03:28:40 -04:00
Billy Donahue
be2c677cff Merge branch 'master' of github.com:BillyDonahue/googletest into travis 2015-08-31 03:21:00 -04:00
Billy Donahue
df688319de travis googlemock as well 2015-08-31 03:19:21 -04:00
Billy Donahue
12a8c19167 travis fix 2015-08-31 02:58:45 -04:00
Billy Donahue
02310e73c6 Merge pull request #1 from BillyDonahue/travis 
travis config
 2015-08-31 02:52:55 -04:00
Billy Donahue
bbb54ef0ee travis config 2015-08-31 02:19:39 -04:00
Billy Donahue
ff49eded84 Merge pull request #574 from BillyDonahue/undoc 
Undoc
 2015-08-30 12:49:46 -04:00
Billy Donahue
dcec1cede2 Merge branch 'master' into undoc 2015-08-30 12:46:50 -04:00
Billy Donahue
2e10aed6d6 Merge branch 'BillyDonahue-undoc' 2015-08-30 12:45:13 -04:00
Billy Donahue
2eb7748e70 merge 2015-08-30 12:40:37 -04:00
Billy Donahue
da25f9ee21 readme merging 2015-08-30 12:38:08 -04:00
Billy Donahue
23bd6d8a9b readme merging 2015-08-30 12:36:37 -04:00
Billy Donahue
b55ac7f36f readme merging 2015-08-30 12:13:33 -04:00
Billy Donahue
24ecc348b9 Merge pull request #571 from srouquette/python3 
Fix gmock_doctor.py for Python3
 2015-08-30 12:09:32 -04:00
Billy Donahue
60c85a40ff Merge pull request #570 from Codie-Labs/master 
xcode: project file corrected
 2015-08-30 12:06:31 -04:00
Syl
ac830d6b19 Fix gmock_doctor.py for Python3 2015-08-30 09:06:14 +02:00
Nagy Gergő
f5bc23fe4d Merge pull request #1 from gregory094/master 
xcode: project file corrected
 2015-08-29 22:52:16 +02:00
Gregory Nagy
8ca3ffdbb7 xcode: project file corrected 
Project file contained the 'README' instead of 'README.md'
that's why the build failed with the fact that it can't
copy this file for its proper location.

Signed-off-by: Gergő Nagy <gergo@getcodie.com>
 2015-08-29 22:48:14 +02:00
Billy Donahue
d945d8c000 fix a link 2015-08-27 10:26:17 -04:00
Billy Donahue
64d23926f9 Merge pull request #568 from lacombar/googlemock-build-dir 
googlemock: change guess of googletest's relative location from ../gtest to ../googletest
 2015-08-27 10:24:19 -04:00
Arnaud Lacombe
eff38a7a0f googlemock: fix unified build 2015-08-26 21:50:38 -07:00
Billy Donahue
3f4e79b999 readme merging 2015-08-26 21:45:10 -04:00
Billy Donahue
4af3c08579 readme merging 2015-08-26 18:29:25 -04:00
Billy Donahue
37b5c297cf readme merging 2015-08-26 18:28:20 -04:00
Billy Donahue
fba825826a Update README.md 2015-08-26 10:02:07 -04:00
Billy Donahue
ecf9459561 Merge remote-tracking branch 'google/master' 2015-08-26 00:52:34 -04:00
Billy Donahue
bf5753ac60 Update README.md 2015-08-25 19:17:02 -04:00
Billy Donahue
09fd2462ac Update README.md 2015-08-25 19:16:41 -04:00
Billy Donahue
0b6d3b195e Merge pull request #512 from google/unification 
Unify googlemock into googletest
 2015-08-25 18:54:04 -04:00
Billy Donahue
661699bfc0 Merge pull request #511 from BillyDonahue/unification 
Bring GoogleMock into the GoogleTest repository
 2015-08-25 18:46:30 -04:00
Billy Donahue
8a3c8c9376 tiny fix 2015-08-25 18:33:08 -04:00
Billy Donahue
5b3ef3bd6c unified project home 2015-08-25 18:23:36 -04:00
Billy Donahue
7563fe553e cat _home.md files into README.md 2015-08-25 17:56:57 -04:00
Billy Donahue
67f6188c8f move ProjectHome files into root 2015-08-25 17:55:28 -04:00
Billy Donahue
ad47332a7a Merge branch 'unification' of github.com:BillyDonahue/googlemock into unification 2015-08-25 17:49:49 -04:00
Billy Donahue
affb09edf0 move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00
Billy Donahue
1f87a0970d Move everything in googletest into googletest/googletest 2015-08-25 16:18:00 -04:00
Billy Donahue
84b8863dd9 Merge remote-tracking branch 'google/master' 2015-08-25 15:54:26 -04:00
Billy Donahue
65f381be21 Merge pull request #182 from BillyDonahue/wiki 
move versioned docs to version directories
 2015-08-25 15:44:43 -04:00
Billy Donahue
3e42adb74f move versioned docs to version directories 2015-08-25 15:42:30 -04:00
Billy Donahue
07b2bd1f7b Merge pull request #180 from google/wiki 
merge wiki branch into master
 2015-08-25 13:54:31 -04:00
Billy Donahue
168ab06783 Merge pull request #179 from BillyDonahue/wiki 
Catch up with doc fixes from false-start repo
 2015-08-25 13:53:10 -04:00
Billy Donahue
06fcd9ff11 readme.md updates 2015-08-25 13:51:43 -04:00
Billy Donahue
36d1a71bad README -> README.md 2015-08-25 13:47:38 -04:00
Billy Donahue
872c422ec2 move CheatSheet.md into docs 2015-08-25 13:47:06 -04:00
Billy Donahue
3b6c87d413 Move all .md files from wiki into docs/ dir. 2015-08-25 13:32:45 -04:00
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