Commit Graph

1162 Commits

Author SHA1 Message Date
drgler
f8514b8da3 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:41 +02:00
drgler
d93ce9d6fb Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:32 +02:00
drgler
fa3bb1a779 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:19:13 +02:00
drgler
6404d45a92 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:18:54 +02:00
Daniel Krügler
8304d06199 Merge branch 'master' into master 2017-08-21 20:14:09 +02:00
Gennadiy Civil
675686a139 Merge pull request #1206 from ShadowIce/methodname-in-exception
Add function name to exception if there's no default action
2017-08-21 10:37:53 -04:00
Maurice Gilden
1ee8079651 Remove unused variable 2017-08-21 10:10:14 +02:00
Gennadiy Civil
3cf65b5d86 Added "explicit" as per compiler suggestion 2017-08-20 15:20:13 -04:00
Gennadiy Civil
026735daf3 Proposing these changes, please review
Slightly better names and cleaner tests.
Please review
2017-08-20 15:15:31 -04:00
Gennadiy Civil
35737ac7ac Merge branch 'master' into methodname-in-exception 2017-08-18 16:26:02 -07:00
Gennadiy Civil
780bae0fac Merge pull request #1215 from henryiii/patch-1
Adding CMake visibility policy setting
2017-08-18 16:25:03 -07:00
Henry Schreiner
5518a1d350 Adding CMake visibility policy setting
This policy setting will silence a warning when using with a visibility settings on targets. Due to the forced `cmake_minimum_version`, policy settings in CMakeLists calling this one (including the main CMakeLists) are lost, forcing the change to be made here.
2017-08-18 15:18:58 -04:00
Maurice Gilden
b0ed43e724 Change tabs to spaces in test case 2017-08-18 15:27:02 +02:00
Maurice Gilden
36777251c0 Switch return type to class without default constructor 2017-08-18 12:28:50 +02:00
Maurice Gilden
cc99900036 Fix test if exceptions are not supported 2017-08-18 11:46:15 +02:00
Maurice Gilden
95f18d9938 adds test for NiceMock with unknown return value 2017-08-18 11:21:28 +02:00
Gennadiy Civil
1183503d11 Merge branch 'master' into methodname-in-exception 2017-08-17 09:08:37 -07:00
Gennadiy Civil
1fe692ce49 Update README.md
Another AppVeyor move
2017-08-16 23:42:53 -07:00
Gennadiy Civil
8f233a74eb Merge branch 'master' into methodname-in-exception 2017-08-16 15:27:29 -07:00
Gennadiy Civil
b7e8a993b4 Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install
Fix problem installing gtest when gmock enabled
2017-08-16 11:26:58 -07:00
Maurice Gilden
5b4166f05f Add function name to exception if there's no default action 2017-08-16 17:53:16 +02:00
Matthew Woehlke
9469fb687d Fix problem installing gtest when gmock enabled
Fix a bug deciding whether to enable the option to install Google Test
caused by one of the dependent option dependencies not being defined
yet.

Fixes #1198; impossible to install Google Test if Google Mock is built.
2017-08-16 10:49:06 -04:00
Gennadiy Civil
5ed471caec Merge pull request #1204 from gennadiycivil/master
Changing Build Status AppVeyor badge with AppVeyor ownership change
2017-08-14 16:05:27 -07:00
Gennadiy Civil
08b1a1f73c Merge branch 'master' into master 2017-08-14 15:29:51 -07:00
misterg
3f3a3ada20 Change AppVeyor Status Badge to point to new AppVeyor Project Location 2017-08-14 18:22:03 -04:00
misterg
a4121dd54b Change AppVeyor Status Badge to point to new AppVeyor Project Location 2017-08-14 18:21:07 -04:00
Gennadiy Civil
e0fc65c5fb Merge pull request #1197 from SoapGentoo/pkgconfig
Add support for pkgconfig
2017-08-14 14:33:41 -04:00
David Seifert
9cacce4e5c Add documentation for pkg-config 2017-08-14 13:45:56 +02:00
David Seifert
8604c4adac Add support for pkgconfig 2017-08-14 13:45:56 +02:00
Gennadiy Civil
673c975a96 Merge pull request #905 from iignatev/master
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
9816b96a6d Merge pull request #857 from KindDragon/patch-1
Add links to IRC channel and Google Group
2017-08-11 11:29:50 -04:00
Gennadiy Civil
c7f4849c0b Merge pull request #919 from delaitre/patch-1
Fix the link to the float comparison article
2017-08-11 10:39:13 -04:00
Gennadiy Civil
052df998c4 Merge pull request #749 from nholthaus/patch-1
Documentation change to add related open source project
2017-08-11 10:38:05 -04:00
Gennadiy Civil
e533ff4bd3 Merge pull request #926 from bartshappee/patch-1
Fix small typo in Cookbook: SeArrayArgument
2017-08-11 10:33:36 -04:00
Gennadiy Civil
e3bd4cbeae Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
c81be0f6fc Merge pull request #871 from tommyleo2/master
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
c523461f3a Merge pull request #937 from srz-zumix/fix-gtest-port-typo
Fix or condition typo ( '|' -> '||' )
2017-08-10 21:30:13 -04:00
Gennadiy Civil
4283f264d6 Merge pull request #957 from sglass68/sim
Fix a few documentation nits in the mock dummies guide
2017-08-10 21:25:06 -04:00
Gennadiy Civil
c822c85659 Merge pull request #1164 from aninf-wo/hethi/remove-old-docs
remove documentation of former versions - it's available in the commit history
2017-08-10 21:19:03 -04:00
Gennadiy Civil
1579064390 Merge pull request #1127 from zulkarnine/patch-1
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -04:00
Gennadiy Civil
cfab28d594 Merge pull request #1192 from eduherminio/master
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
e578186528 Merge pull request #1191 from gennadiycivil/master
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
misterg
97a8498873 Addressing Comments 2017-08-10 16:33:22 -04:00
misterg
c3f65335b7 Addressing comments 2017-08-10 15:33:09 -04:00
drgler
b11b2e403e Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-10 21:19:31 +02:00
drgler
07bba78a5f Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-10 21:18:22 +02:00
Gennadiy Civil
4e284ee657 Update WORKSPACE
Remove comments
2017-08-10 14:47:24 -04:00
Herbert Thielen
dc7214f222 say "former version" instead of "released version" 2017-08-10 20:21:46 +02:00
Eduardo Caceres
854b28f199 Minor style fixes
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
cb5b05436d Added Copyright 2017-08-10 12:03:27 -04:00