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

783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
kosak
794ef030eb Add support for named value-parameterized tests. 2015-07-24 19:46:18 +00:00
kosak
41b5b28d48 Inject implementation of *FromGTestEnv using macros. 2015-07-24 19:07:10 +00:00
kosak
f6df4c6baf Remove some tests. 2015-07-19 22:58:38 +00:00
kosak
c6b9fcd60a Add injection point for GTEST_KILLED_BY_SIGNAL_OVERRIDE. 2015-07-19 22:42:00 +00:00
kosak
831b87f234 Do not create an extra default instance of T when constructing a ThreadLocal<T>. 2015-07-19 22:33:19 +00:00
kosak
9e38d77f65 Allow the single-arg Values() overload to to conversions, just like every other 
overload.
 2015-07-19 22:21:58 +00:00
kosak
7d7beaa155 Condition some code on !GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ 2015-07-19 22:05:06 +00:00
kosak
4d69b1607a GTEST_USE_OWN_FLAGFILE support 2015-07-19 21:50:45 +00:00
kosak
67c377d3b1 Move Callback-related generated actions to a custom/ file. 2015-07-19 20:39:47 +00:00
kosak
e7dbfde8ce Move stack trace logic into custom/ and add a macro to inject it. 2015-07-17 23:57:03 +00:00
kosak
fe95bc332d Determine the existence of hash_map/hash_set in gtest-port.h. 2015-07-17 23:08:48 +00:00
kosak
060b7452ec Implement GetThreadCount for Linux. 2015-07-17 22:53:00 +00:00
kosak
4f8dc917eb Add support for --gtest_flagfile. 2015-07-17 22:11:58 +00:00
kosak
195610d30c Add support for --gtest_flagfile 2015-07-17 21:56:19 +00:00
kosak
0928adbfea Move the selection of the flag saver implementation into gtest-port.h and 
custom/gtest-port.h.
 2015-07-14 22:44:39 +00:00
kosak
80167de705 Minor refactoring. 2015-07-14 22:29:59 +00:00
kosak
38dd7485c0 Change GetDefaultFilter to allow for the injection of a custom filter. 2015-07-14 21:49:27 +00:00
kosak
f025eba07b Add support for gtest custom printers. 2015-07-14 21:26:09 +00:00
kosak
1cc9514de5 Add comment. 2015-07-14 20:58:40 +00:00
kosak
54566c2573 Remove TestPrematureExitFileEnvVarIsSet 2015-07-14 20:52:01 +00:00
kosak
fb9caa4a18 Minor changes. 2015-07-14 20:44:00 +00:00
kosak
683886c567 Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated in INSTANTIATE_TEST_CASE_P. 2015-07-14 20:29:34 +00:00
kosak
1e4d31008f Control death test with an #ifdef guard. 2015-07-14 20:26:09 +00:00
kosak
156d1b513b Create custom/gtest-port.h to hold custom logic. 2015-07-14 19:56:37 +00:00
kosak
d5ac8cd9eb Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated in 
INSTANTIATE_TEST_CASE_P.
 2015-07-13 22:45:50 +00:00
kosak
0f3d673be1 fully-qualify use of scoped_ptr name 2015-07-13 21:33:41 +00:00
kosak
d86a723ed9 Mark the default constructor of Matcher<> explicit. 
This prevents implicitly constructing a matcher from {}.
 2015-07-13 21:19:43 +00:00
kosak
9b1a944ec4 Fix EXPECT_THAT() to support literal strings as a second argument. 2015-04-28 23:06:58 +00:00
kosak
6305ff5a92 Change IsNull and NotNull to use ==/!= nullptr in C++11. 
Also update gmock_doctor due to Clang wording change.
 2015-04-28 22:36:31 +00:00
kosak
1197daf357 urxvt supports colors 2015-04-28 22:04:35 +00:00