Commit Graph

1211 Commits

Author SHA1 Message Date
Herbert Thielen
b34d59baf1 change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
Gennadiy Civil
cb4c337a26 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
68622227af Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
# Conflicts:
#	.gitignore
2017-08-31 12:22:53 +02:00
Gennadiy Civil
731894ae3e 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
8567479df0 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
3c58954dec 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
76b0a834a5 removed internal link ( not allowed in OSS) 2017-08-30 14:50:40 -04:00
Scott Graham
63faadca89 Note that it is preferable for Googlers to create a CL internally first 2017-08-30 11:29:06 -07:00
Gennadiy Civil
d5525cdcf8 Merge branch 'master' into master 2017-08-30 14:11:38 -04:00
Gennadiy Civil
c4b70d8378 Merge branch 'master' into hethi/travis-unused-cmake 2017-08-30 11:49:23 -04:00
Gennadiy Civil
94138a17cc 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
abb93b4f57 fix SetUp/TearDownTestCase() in AdvancedGuide
fixes issue #1087
2017-08-30 12:19:59 +02:00
Herbert Thielen
92ee38b0ce Merge branch 'master' into hethi/travis-unused-cmake 2017-08-30 10:43:54 +02:00
Gennadiy Civil
87e04295f3 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
f4a64c4c72 Merge branch 'master' into hethi/fix-typo 2017-08-29 23:59:32 -04:00
Gennadiy Civil
4676e5913e 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
e031083eb3 Merge pull request #1229 from aninf-wo/hethi/typo-xUnit
fix typo: xUnit
2017-08-29 19:30:38 -04:00
Gennadiy Civil
cfe8c3ebbf Merge branch 'master' into hethi/typo-xUnit 2017-08-29 19:30:18 -04:00
Gennadiy Civil
132802e909 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
4da24d2b53 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
4476885245 Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA 2017-08-29 12:45:26 -07:00
Herbert Thielen
f48ebe2bcc use plural verb as mentioned in issue #1105 2017-08-29 21:20:46 +02:00
Herbert Thielen
f3f8930215 remove Yob's comma mentioned in issue #1105 2017-08-29 21:19:45 +02:00
Herbert Thielen
63c4bbc1c2 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
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
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
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