Gennadiy Civil
b46755be30
Merge pull request #1229 from aninf-wo/hethi/typo-xUnit
...
fix typo: xUnit
2017-08-29 19:30:38 -04:00
Gennadiy Civil
58fd184c7f
Merge branch 'master' into hethi/typo-xUnit
2017-08-29 19:30:18 -04:00
Gennadiy Civil
c4126e0463
Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
...
reduce travis buildjobs by 4/12
2017-08-29 19:27:27 -04:00
Gennadiy Civil
24ceb4f4f5
Merge pull request #1231 from aninf-wo/heth/travis-verbose-make
...
switch on verbose make in travis builds
2017-08-29 19:26:34 -04:00
Herbert Thielen
d33861dca6
run combined build only
...
There is no need for separate 'googlemock' and 'googletest' builds,
as the 'googlemock' build includes 'googletest' and it's unit tests.
2017-08-29 17:41:26 +02:00
Herbert Thielen
4a45157589
switch on verbose make
2017-08-29 17:04:15 +02:00
Gennadiy Civil
30c1e00afb
Merge branch 'master' into hethi/typo-xUnit
2017-08-29 10:19:33 -04:00
Gennadiy Civil
96f3745e73
Merge pull request #1189 from alyssawilk/flag-default
...
Adding a flag option to change the default mock type
2017-08-29 10:18:33 -04:00
Herbert Thielen
fe760e9c6d
fix typo: xUnit
2017-08-29 15:27:54 +02:00
Alyssa Wilk
fa5d3b3845
Applying lint checks from upstream google3
2017-08-28 16:13:41 -04:00
Alyssa Wilk
c00373320d
Merge branch 'refs/heads/master' into flag-default
2017-08-28 16:10:12 -04:00
Gennadiy Civil
b43bfcf491
Merge pull request #1222 from KindDragon/vs-projects-fix3
...
Support x64 configuration for old VS2015 projects
2017-08-25 10:31:12 -04:00
Gennadiy Civil
a7eeb6971f
Merge branch 'master' into vs-projects-fix3
2017-08-24 22:53:22 -04:00
Gennadiy Civil
f25921565b
Merge pull request #1221 from KindDragon/vs-projects-fix2
...
Remove gtest VS2005 projects
2017-08-24 22:53:00 -04:00
Arkady Shapkin
cb8ebf5c9a
Support x64 configuration for old VS2015 projects
2017-08-25 01:58:00 +03:00
Arkady Shapkin
45287f3dff
Remove gtest VS2005 projects
2017-08-25 01:57:35 +03:00
Gennadiy Civil
eabd5c908d
Merge pull request #1186 from Dani-Hub/master
...
Prevent infinite loops for recursive containers like boost::filesystem::path
2017-08-24 10:50:17 -04:00
Gennadiy Civil
87327b12e9
Merge branch 'master' into master
2017-08-23 14:27:55 -04:00
Gennadiy Civil
c38baf9858
Merge pull request #1219 from KindDragon/vs-projects-fix
...
Support x64 configuration for VS2010 projects
2017-08-23 14:15:36 -04:00
Daniel Krügler
ebc7b01d89
Merge branch 'master' into master
2017-08-23 11:11:44 +02:00
Gennadiy Civil
f4abce4609
Merge branch 'master' into vs-projects-fix
2017-08-22 22:38:22 -04:00
Gennadiy Civil
863e02644b
Merge pull request #1220 from romkatv/property-matcher
...
Support ref-qualified member functions in Property().
2017-08-22 22:37:30 -04:00
Arkady Shapkin
88269cd365
Support x64 configuration for old VS2010 projects
...
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
2017-08-23 01:45:44 +03:00
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
Roman Perepelitsa
966b549c88
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +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
Alyssa Wilk
a2803bc37d
Handling invalid flag values
2017-08-16 12:43:26 -04: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
