Gennadiy Civil
058b318bc7
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-18 12:02:12 -05:00
Gennadiy Civil
1865ecaf17
Merge pull request #1354 from coryan/fix-top-level-license
...
Add top-level LICENSE and CONTRIBUTING.md files [skip ci]
2017-12-15 15:49:18 -05:00
Carlos O'Ryan
f34cbefe50
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license
2017-12-11 19:34:19 -05:00
Carlos O'Ryan
23a014ab57
Refactor docs about contributions to CONTRIBUTING.md.
...
Per the review comments.
2017-12-11 19:33:27 -05:00
Gennadiy Civil
cb95f316c8
Merge branch 'master' into fix-top-level-license
2017-12-11 13:13:07 -05:00
Gennadiy Civil
0fe96607d8
Merge pull request #1355 from coryan/blaze-build-travis
...
Implement bazel-based builds in Travis.
2017-12-11 13:08:20 -05:00
Gennadiy Civil
ed811dc79f
Merge branch 'master' into blaze-build-travis
2017-12-11 10:48:12 -05:00
Gennadiy Civil
55fca1937d
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-09 09:41:02 -05:00
Gennadiy Civil
59202300f1
Merge pull request #1333 from sam-lunt/use-system-includes
...
Use system includes
2017-12-09 09:38:16 -05:00
Carlos O'Ryan
c82cd5e41e
Also add documentation around becoming a contributor.
2017-12-08 23:20:55 -05:00
Carlos O'Ryan
11841175d8
Wrong LICENSE file, sorry. Corrected. [skip ci]
2017-12-08 23:16:46 -05:00
Carlos O'Ryan
bc3320b7f1
Implement bazel-based builds in Travis.
...
This refactored test build scripts to enable
bazel-build scripts in Travis.
2017-12-08 20:59:07 -05:00
Carlos O'Ryan
e22d344c51
Add Apache-2.0 LICENSE file.
2017-12-08 17:24:23 -05:00
Gennadiy Civil
10ef1d9a1e
Merge branch 'master' into use-system-includes
2017-12-08 15:11:13 -05:00
Gennadiy Civil
cc372a071b
Merge pull request #1340 from coryan/fix-googlemock-test-build-file
...
Add licenses() directive for googlemock/tests.
2017-12-08 13:03:20 -05:00
Carlos O'Ryan
cf3adad594
Add licenses() directive for googlemock/tests.
...
Without the directive embedding googletest into third_party breaks
any //... target.
2017-12-08 12:08:25 -05:00
Gennadiy Civil
4d1f930af8
Merge pull request #1345 from coryan/fix-travis-build-macOS
...
Fix Travis build
2017-12-08 11:09:01 -05:00
Gennadiy Civil
efc6abae67
Merge branch 'master' into fix-travis-build-macOS
2017-12-08 11:08:54 -05:00
Gennadiy Civil
887a6c6420
Merge pull request #1348 from wmamrak/master
...
Remove C4996 warning in VS2017
2017-12-08 11:08:17 -05:00
Wojciech Mamrak
57bb0bbbf8
Remove C4996 warning in VS2017
2017-12-07 18:20:25 +01:00
Wojciech Mamrak
3464f76e89
Improved description of VS std::tuple support
2017-12-07 18:18:17 +01:00
Wojciech Mamrak
8d9d6bb0a3
Improved description of VS std::tuple support
2017-12-07 18:17:43 +01:00
Carlos O'Ryan
4aa05bd4ff
Only switch to g++-4.9 on Linux.
2017-12-06 22:43:39 -05:00
Gennadiy Civil
a868e618c0
Merge pull request #1225 from brian-peloton/master
...
Speed up printing of characters which need hex escaping
2017-12-05 17:19:23 -05:00
Gennadiy Civil
9e236748fb
Merge branch 'master' into master
2017-12-01 16:41:53 -05:00
Gennadiy Civil
c5cba7d17a
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-01 16:31:29 -05:00
Gennadiy Civil
ce919c3ddf
Merge branch 'master' into use-system-includes
2017-12-01 16:29:28 -05:00
Gennadiy Civil
247a3d8e5e
Merge pull request #1324 from whame/master
...
Fix issue #826 by treating MinGW as "non-Windows" when determining colored output
2017-12-01 16:27:33 -05:00
Sam Lunt
f46bd00e36
make includes system
2017-11-27 17:31:07 -06:00
Gennadiy Civil
49eb76df47
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-11-07 10:32:23 -08:00
whame
82447f23be
Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output
2017-11-07 15:22:50 +01:00
Gennadiy Civil
d175c8bf82
Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312
...
remove markdown stars (bold) from code examples
2017-10-30 11:18:33 -04:00
Gennadiy Civil
43d6ad75bc
Merge pull request #1308 from KindDragon/vs2017-ci
...
Enable CI for VS2017
2017-10-30 11:11:38 -04:00
Herbert Thielen
8866af0386
remove markdown stars (bold) from code examples
2017-10-29 17:12:00 +01:00
Arkady Shapkin
b153bfd8f5
Enable CI for VS2017
2017-10-26 00:02:11 +03:00
Gennadiy Civil
3121b2049e
Merge pull request #1304 from m-gupta/gtestapifix
...
googletest: Add GTEST_API_ attribute to ThreadLocal class.
2017-10-25 15:57:21 -04:00
Gennadiy Civil
e93a15c5a5
Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning
...
Remove gcc 6 misleading indentations warnings
2017-10-25 13:51:48 -04:00
m-gupta
060783b7d2
Merge branch 'master' into gtestapifix
2017-10-25 10:24:56 -07:00
Romain Geissler
20e2de7d8b
Remove gcc 6 misleading indentations.
2017-10-25 17:53:01 +02:00
Gennadiy Civil
7684db3271
Merge pull request #1218 from KindDragon/vs-build-fix
...
VS2015/2017 build fix and enable C++11 features (attempt number three)
2017-10-25 10:33:54 -04:00
Arkady Shapkin
840c711e7b
Fix gmock tests when std::unary_function unavailable
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
2641b021fc
Fix tests with VS2015 and VS2017
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
77380cddf7
Enable C++11 features for VS2015 and VS2017
2017-10-25 03:24:49 +03:00
Gennadiy Civil
6d0bb75c81
Merge pull request #1139 from chehsunliu/master
...
Update the CMakeLists.txt section in googletest README.md.
2017-10-24 11:27:04 -04:00
Manoj Gupta
1beff241c3
googletest: Add GTEST_API_ attribute to ThreadLocal class.
...
ThreadLocal class needs to be have default visibility.
Root cause is gtest uses typeinfo for the ThreadLocal class.
The problem manifests When gtest/gmock are built as a shared library
with libc++. When a class is used in typeinfo, it must have default
visibility.
There is an explanation about typeinfo and visibility here:
https://developer.apple.com/library/content/documentation/DeveloperTools/Conceptual/CppRuntimeEnv/Articles/SymbolVisibility.html
When libc++ is used with gtest in shared library mode, any tests
that are compiled with -fvisibility=hidden and exercise the
macro EXPECT_CALL, it results in an abort like:
[ FATAL ] /usr/include/gtest/internal/gtest-port.h:1394::
Condition typeid(*base) == typeid(Derived) failed.
This is because the typeinfo for ThreadLocal class is not visible.
Therefore, linker failed to match it to the shared library symbol, creating a
new symbol instead.
This fixes https://github.com/google/googletest/issues/1207 .
2017-10-20 14:41:06 -07:00
Gennadiy Civil
c208d8df23
Merge branch 'master' into master
2017-10-20 17:25:41 -04:00
Gennadiy Civil
69e48e92de
Merge pull request #1300 from gennadiycivil/master
...
Workaround for Travis issue https://goo.gl/d5eV8o
2017-10-18 16:24:59 -04:00
Gennadiy Civil
48986f9d4c
Merge branch 'master' into master
2017-10-18 16:22:29 -04:00
Gennadiy Civil
54c2648bff
Workaround for Travis issue https://goo.gl/d5eV8o
2017-10-18 16:18:47 -04:00
Gennadiy Civil
27be0dfb53
Merge pull request #1298 from google/revert-1297-master
...
Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is …"
2017-10-18 10:42:49 -04:00
