eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,364 Commits 13 Branches 14 Tags 23 MiB
4f3a212568
Commit Graph

1364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
4f3a212568 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-15 15:49:46 -05:00
Gennadiy Civil
3e48195784 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
414af0e8a5 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
3c218ff29c Refactor docs about contributions to CONTRIBUTING.md. 
Per the review comments.
 2017-12-11 19:33:27 -05:00
Gennadiy Civil
0cbe36bada Merge branch 'master' into fix-top-level-license 2017-12-11 13:13:07 -05:00
Gennadiy Civil
b0ed245299 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
a8e0fde335 Merge branch 'master' into blaze-build-travis 2017-12-11 10:48:12 -05:00
Gennadiy Civil
359a89436c Merge pull request #1333 from sam-lunt/use-system-includes 
Use system includes
 2017-12-09 09:38:16 -05:00
Carlos O'Ryan
b835337f48 Also add documentation around becoming a contributor. 2017-12-08 23:20:55 -05:00
Carlos O'Ryan
040cee972e Wrong LICENSE file, sorry. Corrected. [skip ci] 2017-12-08 23:16:46 -05:00
Carlos O'Ryan
71ba2c8764 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
077becb7eb Add Apache-2.0 LICENSE file. 2017-12-08 17:24:23 -05:00
Gennadiy Civil
7b956df687 Merge branch 'master' into use-system-includes 2017-12-08 15:11:13 -05:00
Gennadiy Civil
04f2b1692f 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
63723d54aa 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
d70b7007c1 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-08 11:56:41 -05:00
Gennadiy Civil
4cc47a1a75 Merge pull request #1345 from coryan/fix-travis-build-macOS 
Fix Travis build
 2017-12-08 11:09:01 -05:00
Gennadiy Civil
a1bba746bc Merge branch 'master' into fix-travis-build-macOS 2017-12-08 11:08:54 -05:00
Gennadiy Civil
95958e9f16 Merge pull request #1348 from wmamrak/master 
Remove C4996 warning in VS2017
 2017-12-08 11:08:17 -05:00
Wojciech Mamrak
8f178075b9 Remove C4996 warning in VS2017 2017-12-07 18:20:25 +01:00
Wojciech Mamrak
98e909ef6d Improved description of VS std::tuple support 2017-12-07 18:18:17 +01:00
Wojciech Mamrak
e858bd6b7c Improved description of VS std::tuple support 2017-12-07 18:17:43 +01:00
Carlos O'Ryan
5f16f9a399 Only switch to g++-4.9 on Linux. 2017-12-06 22:43:39 -05:00
Gennadiy Civil
3cbf856bc8 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
Carlos O'Ryan
ab6cd7a97f Run autoconf from top-level directory. 
This is part (hopefully all) of the fixes for #776.  The top-level
configure.ac configures googletest first and then googlemock.
With this changes it is possible to embed googletest into another
project that uses autoconf.  For an example (though it is WIP), see
the commits (and soon PR) referenced from google/protobuf#236.
 2017-12-03 14:07:35 -05:00
Gennadiy Civil
081432d865 Merge branch 'master' into master 2017-12-01 16:41:53 -05:00
Gennadiy Civil
aa5aee1235 Merge branch 'master' into use-system-includes 2017-12-01 16:29:28 -05:00
Gennadiy Civil
0c28ac7934 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
332bd657f9 make includes system 2017-11-27 17:31:07 -06:00
whame
d3d85627fb Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output 2017-11-07 15:22:50 +01:00
Gennadiy Civil
4ebc9034c2 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
60ce69d807 Merge pull request #1308 from KindDragon/vs2017-ci 
Enable CI for VS2017
 2017-10-30 11:11:38 -04:00
Herbert Thielen
beabbc7da6 remove markdown stars (bold) from code examples 2017-10-29 17:12:00 +01:00
Arkady Shapkin
db52274f30 Enable CI for VS2017 2017-10-26 00:02:11 +03:00
Gennadiy Civil
cb682a5abc 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
6b060a7e30 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
30d58bcd31 Merge branch 'master' into gtestapifix 2017-10-25 10:24:56 -07:00
Romain Geissler
56088debda Remove gcc 6 misleading indentations. 2017-10-25 17:53:01 +02:00
Gennadiy Civil
f5ce6a161f 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
a938f25467 Fix gmock tests when std::unary_function unavailable 2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
950e2805da Fix tests with VS2015 and VS2017 2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
85e4858c92 Enable C++11 features for VS2015 and VS2017 2017-10-25 03:24:49 +03:00
Gennadiy Civil
c01a24e10c 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
f4d7a04eb4 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
302cebfb6a Merge branch 'master' into master 2017-10-20 17:25:41 -04:00
Gennadiy Civil
c4709fa4ed 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
36dbd8cbfb Merge branch 'master' into master 2017-10-18 16:22:29 -04:00
Gennadiy Civil
b10fafd2f0 Workaround for Travis issue https://goo.gl/d5eV8o 2017-10-18 16:18:47 -04:00
Gennadiy Civil
9d34ec6a54 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
Gennadiy Civil
24c8503b32 Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…" 2017-10-18 10:42:33 -04:00