Gasprd Petit
|
f6dde80e94
|
Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is expected to abort()
|
8 years ago |
Gennadiy Civil
|
ee53b281ba
|
Merge branch 'master' into user_logger_instead_of_printf
|
8 years ago |
|
Gennadiy Civil
|
69e794ca75
|
Merge pull request #870 from KindDragon/mingw64-appveyour
AppVeyor MinGW-w64 test build
|
8 years ago |
Arkady Shapkin
|
633488a763
|
Merge branch 'master' into mingw64-appveyour
|
8 years ago |
|
Gennadiy Civil
|
836c194a81
|
Merge pull request #1241 from aninf-wo/hethi/issue-635-old-links
change links from former code.google.com to current github repository
|
8 years ago |
|
Arkady Shapkin
|
8282229d4f
|
Merge branch 'master' into mingw64-appveyour
|
8 years ago |
Herbert Thielen
|
e033d8c73d
|
change links from former code.google.com to current github repository
|
8 years ago |
|
Gennadiy Civil
|
92e920730d
|
Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment
fix example's comment
|
8 years ago |
|
Herbert Thielen
|
84bd72ba3c
|
Merge branch 'master' into hethi/fix-faq-example-comment
|
8 years ago |
|
Herbert Thielen
|
14cf7f574a
|
fix example's comment
|
8 years ago |
|
Gennadiy Civil
|
a430e9c176
|
Merge pull request #865 from frosteyes/master
Moved the ignoring of *.pyc files to top level
|
8 years ago |
Claus Stovgaard
|
34355c0e87
|
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
# Conflicts:
# .gitignore
|
8 years ago |
|
Gennadiy Civil
|
16bfba08e2
|
Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake
remove non-existing gmock_build_samples switch
|
8 years ago |
|
Arkadiy Shapkin
|
5dde668e09
|
AppVeyor MinGW-w64 test build
|
8 years ago |
|
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
|
8 years ago |
|
Gennadiy Civil
|
fa70b84ab5
|
Removed "Trivial"
Who knows? may not be very trivial given the code drift between internal and OSS
|
8 years ago |
|
Gennadiy Civil
|
c4e01616af
|
removed internal link ( not allowed in OSS)
|
8 years ago |
Scott Graham
|
0eb49f4d6b
|
Note that it is preferable for Googlers to create a CL internally first
|
8 years ago |
|
Gennadiy Civil
|
bb1c4af487
|
Merge branch 'master' into master
|
8 years ago |
|
Gennadiy Civil
|
c4ec2ac04d
|
Merge branch 'master' into hethi/travis-unused-cmake
|
8 years ago |
|
Gennadiy Civil
|
5d431c650f
|
Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide
fix SetUp/TearDownTestCase() in AdvancedGuide
|
8 years ago |
|
Herbert Thielen
|
f0c72bfe09
|
fix SetUp/TearDownTestCase() in AdvancedGuide
fixes issue #1087
|
8 years ago |
Herbert Thielen
|
c780e0e2c4
|
Merge branch 'master' into hethi/travis-unused-cmake
|
8 years ago |
|
Gennadiy Civil
|
71e2858f32
|
Merge pull request #1226 from aninf-wo/hethi/fix-typo
fix typo in comment and string (SetUpTestCase)
|
8 years ago |
|
Gennadiy Civil
|
5bd8e83217
|
Merge branch 'master' into hethi/fix-typo
|
8 years ago |
|
Gennadiy Civil
|
298cd5e9c4
|
Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105
fix typos mentioned in issue 1105
|
8 years ago |
|
Gennadiy Civil
|
b46755be30
|
Merge pull request #1229 from aninf-wo/hethi/typo-xUnit
fix typo: xUnit
|
8 years ago |
|
Gennadiy Civil
|
58fd184c7f
|
Merge branch 'master' into hethi/typo-xUnit
|
8 years ago |
|
Gennadiy Civil
|
c4126e0463
|
Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
reduce travis buildjobs by 4/12
|
8 years ago |
|
Gennadiy Civil
|
24ceb4f4f5
|
Merge pull request #1231 from aninf-wo/heth/travis-verbose-make
switch on verbose make in travis builds
|
8 years ago |
|
Scott Graham
|
c3d1d33560
|
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA
|
8 years ago |
|
Herbert Thielen
|
bb8399e1ba
|
use plural verb as mentioned in issue #1105
|
8 years ago |
|
Herbert Thielen
|
29c07aa9db
|
remove Yob's comma mentioned in issue #1105
|
8 years ago |
|
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.
|
8 years ago |
|
Herbert Thielen
|
4a45157589
|
switch on verbose make
|
8 years ago |
|
Herbert Thielen
|
8364718500
|
remove non-existing gmock_build_samples switch
|
8 years ago |
|
Gennadiy Civil
|
30c1e00afb
|
Merge branch 'master' into hethi/typo-xUnit
|
8 years ago |
|
Gennadiy Civil
|
96f3745e73
|
Merge pull request #1189 from alyssawilk/flag-default
Adding a flag option to change the default mock type
|
8 years ago |
|
Herbert Thielen
|
fe760e9c6d
|
fix typo: xUnit
|
8 years ago |
|
Herbert Thielen
|
daaed2b6cb
|
fix typo in comment and string (SetUpTestCase)
|
8 years ago |
Alyssa Wilk
|
fa5d3b3845
|
Applying lint checks from upstream google3
|
8 years ago |
|
Alyssa Wilk
|
c00373320d
|
Merge branch 'refs/heads/master' into flag-default
|
8 years ago |
|
Gennadiy Civil
|
b43bfcf491
|
Merge pull request #1222 from KindDragon/vs-projects-fix3
Support x64 configuration for old VS2015 projects
|
8 years ago |
|
Gennadiy Civil
|
a7eeb6971f
|
Merge branch 'master' into vs-projects-fix3
|
8 years ago |
|
Gennadiy Civil
|
f25921565b
|
Merge pull request #1221 from KindDragon/vs-projects-fix2
Remove gtest VS2005 projects
|
8 years ago |
|
Arkady Shapkin
|
cb8ebf5c9a
|
Support x64 configuration for old VS2015 projects
|
8 years ago |
|
Arkady Shapkin
|
45287f3dff
|
Remove gtest VS2005 projects
|
8 years ago |
|
Gennadiy Civil
|
eabd5c908d
|
Merge pull request #1186 from Dani-Hub/master
Prevent infinite loops for recursive containers like boost::filesystem::path
|
8 years ago |
|
Gennadiy Civil
|
87327b12e9
|
Merge branch 'master' into master
|
8 years ago |
|
Gennadiy Civil
|
c38baf9858
|
Merge pull request #1219 from KindDragon/vs-projects-fix
Support x64 configuration for VS2010 projects
|
8 years ago |
