Gennadiy Civil
a430e9c176
Merge pull request #865 from frosteyes/master
...
Moved the ignoring of *.pyc files to top level
2017-08-31 09:13:07 -04:00
Claus Stovgaard
34355c0e87
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
...
# Conflicts:
# .gitignore
2017-08-31 12:22:53 +02:00
Gennadiy Civil
16bfba08e2
Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake
...
remove non-existing gmock_build_samples switch
2017-08-30 22:18:24 -04:00
Gennadiy Civil
7f8fefabed
Merge pull request #1237 from sgraham/update-docs-3
...
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change
2017-08-30 17:29:43 -04:00
Gennadiy Civil
fa70b84ab5
Removed "Trivial"
...
Who knows? may not be very trivial given the code drift between internal and OSS
2017-08-30 14:51:36 -04:00
Gennadiy Civil
c4e01616af
removed internal link ( not allowed in OSS)
2017-08-30 14:50:40 -04:00
Scott Graham
0eb49f4d6b
Note that it is preferable for Googlers to create a CL internally first
2017-08-30 11:29:06 -07:00
Gennadiy Civil
bb1c4af487
Merge branch 'master' into master
2017-08-30 14:11:38 -04:00
Gennadiy Civil
c4ec2ac04d
Merge branch 'master' into hethi/travis-unused-cmake
2017-08-30 11:49:23 -04:00
Gennadiy Civil
5d431c650f
Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide
...
fix SetUp/TearDownTestCase() in AdvancedGuide
2017-08-30 08:47:10 -04:00
Herbert Thielen
f0c72bfe09
fix SetUp/TearDownTestCase() in AdvancedGuide
...
fixes issue #1087
2017-08-30 12:19:59 +02:00
Herbert Thielen
c780e0e2c4
Merge branch 'master' into hethi/travis-unused-cmake
2017-08-30 10:43:54 +02:00
Gennadiy Civil
71e2858f32
Merge pull request #1226 from aninf-wo/hethi/fix-typo
...
fix typo in comment and string (SetUpTestCase)
2017-08-30 00:33:30 -04:00
Gennadiy Civil
5bd8e83217
Merge branch 'master' into hethi/fix-typo
2017-08-29 23:59:32 -04:00
Gennadiy Civil
298cd5e9c4
Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105
...
fix typos mentioned in issue 1105
2017-08-29 19:31:16 -04:00
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
Scott Graham
c3d1d33560
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA
2017-08-29 12:45:26 -07:00
Herbert Thielen
bb8399e1ba
use plural verb as mentioned in issue #1105
2017-08-29 21:20:46 +02:00
Herbert Thielen
29c07aa9db
remove Yob's comma mentioned in issue #1105
2017-08-29 21:19:45 +02: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
Herbert Thielen
8364718500
remove non-existing gmock_build_samples switch
2017-08-29 16:35:41 +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
Herbert Thielen
daaed2b6cb
fix typo in comment and string (SetUpTestCase)
2017-08-29 14:22:09 +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
