Herbert Thielen
cb70fb93bb
switch on verbose make
2017-08-29 17:04:15 +02:00
Herbert Thielen
a1fc4f9e80
remove non-existing gmock_build_samples switch
2017-08-29 16:35:41 +02:00
Gennadiy Civil
71357952d2
Merge branch 'master' into hethi/typo-xUnit
2017-08-29 10:19:33 -04:00
Gennadiy Civil
eb5b0d0ea7
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
1133462278
fix typo: xUnit
2017-08-29 15:27:54 +02:00
Herbert Thielen
ad0e3af8a3
remove unused TestCase import
2017-08-29 14:27:10 +02:00
Herbert Thielen
815428993e
fix typo in comment and string (SetUpTestCase)
2017-08-29 14:22:09 +02:00
Alyssa Wilk
7eb7cbb51d
Applying lint checks from upstream google3
2017-08-28 16:13:41 -04:00
Alyssa Wilk
6a0c4aab6d
Merge branch 'refs/heads/master' into flag-default
2017-08-28 16:10:12 -04:00
Brian Silverman
12208b0948
Speed up printing of characters which need hex escaping
...
This change speeds up the runtime of a value-parameterized test I have
which has lots of values with large strings full of unprintable
characters by 2x. I profiled it and traced most of the slowness during
googletest startup down to the way String::FormatHexInt was creating and
destroyed a stringstream for each character in the string for each
value.
2017-08-28 16:00:48 -04:00
Gennadiy Civil
84d8831a08
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
bc44b63f3a
Merge branch 'master' into vs-projects-fix3
2017-08-24 22:53:22 -04:00
Gennadiy Civil
1d7514523b
Merge pull request #1221 from KindDragon/vs-projects-fix2
...
Remove gtest VS2005 projects
2017-08-24 22:53:00 -04:00
Arkady Shapkin
b0657ae844
Support x64 configuration for old VS2015 projects
2017-08-25 01:58:00 +03:00
Arkady Shapkin
f9f6c5ddcb
Remove gtest VS2005 projects
2017-08-25 01:57:35 +03:00
Gennadiy Civil
dd1f44c10a
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
34a79744f1
Merge branch 'master' into master
2017-08-23 14:27:55 -04:00
Gennadiy Civil
c8275c755b
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
89f828afa3
Merge branch 'master' into master
2017-08-23 11:11:44 +02:00
Gennadiy Civil
d2cf069fe2
Merge branch 'master' into vs-projects-fix
2017-08-22 22:38:22 -04:00
Gennadiy Civil
2e06cd7f60
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
40e2b2f67d
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
10d96ee13f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:41 +02:00
drgler
57bd507b1f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:32 +02:00
drgler
4a8f72f8f1
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:19:13 +02:00
drgler
0654fb095d
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:18:54 +02:00
Roman Perepelitsa
75a9eed0f5
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Daniel Krügler
71b9b22dd6
Merge branch 'master' into master
2017-08-21 20:14:09 +02:00
Gennadiy Civil
1f4def5cde
Merge branch 'master' into wrong-version-reported
2017-08-21 13:11:58 -04:00
Gennadiy Civil
63fecf15ab
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
fad8a6b4f5
Remove unused variable
2017-08-21 10:10:14 +02:00
Gennadiy Civil
9fdd6ccd92
Added "explicit" as per compiler suggestion
2017-08-20 15:20:13 -04:00
Gennadiy Civil
e5095758ba
Proposing these changes, please review
...
Slightly better names and cleaner tests.
Please review
2017-08-20 15:15:31 -04:00
Gennadiy Civil
5378815478
Merge branch 'master' into methodname-in-exception
2017-08-18 16:26:02 -07:00
Gennadiy Civil
0d2f766b4e
Merge pull request #1215 from henryiii/patch-1
...
Adding CMake visibility policy setting
2017-08-18 16:25:03 -07:00
Henry Schreiner
3a31c6b4f4
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
29e05dea1d
Change tabs to spaces in test case
2017-08-18 15:27:02 +02:00
Maurice Gilden
4d864c5e7d
Switch return type to class without default constructor
2017-08-18 12:28:50 +02:00
Maurice Gilden
e9a2da4cf8
Fix test if exceptions are not supported
2017-08-18 11:46:15 +02:00
Maurice Gilden
fe1b2563ab
adds test for NiceMock with unknown return value
2017-08-18 11:21:28 +02:00
Gennadiy Civil
f1ed16cbd0
Merge branch 'master' into methodname-in-exception
2017-08-17 09:08:37 -07:00
Gennadiy Civil
26853b870a
Update README.md
...
Another AppVeyor move
2017-08-16 23:42:53 -07:00
Gennadiy Civil
e8f65b365e
Merge branch 'master' into methodname-in-exception
2017-08-16 15:27:29 -07:00
Gennadiy Civil
e933b7f1bb
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
6a4d19119e
Handling invalid flag values
2017-08-16 12:43:26 -04:00
Maurice Gilden
a63b714c18
Add function name to exception if there's no default action
2017-08-16 17:53:16 +02:00
Matthew Woehlke
8dabb36856
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
fd6bce6233
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
0a93e0426a
Merge branch 'master' into master
2017-08-14 15:29:51 -07:00
misterg
d0587e9198
Change AppVeyor Status Badge to point to new AppVeyor Project Location
2017-08-14 18:22:03 -04:00
