Gennadiy Civil
10ef1d9a1e
Merge branch 'master' into use-system-includes
2017-12-08 15:11:13 -05:00
bryanzim
d6a4478caf
Merge branch 'master' into master
2017-12-08 13:11:34 -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
a30e15b144
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-08 11:56:41 -05:00
Gennadiy Civil
8f90d46c8c
Merge branch 'master' into fix-argc
2017-12-08 11:55:08 -05:00
bryanzim
4aae1600d0
Merge branch 'master' into master
2017-12-08 11:31:31 -05:00
Gennadiy Civil
cdedd189b2
Merge branch 'master' into fix-core-dump-shared
2017-12-08 11:12:19 -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
Conor Burgess
4d50715c2b
Fix location of _NSGetArgv correction.
2017-12-07 11:49:33 +00:00
Conor Burgess
ad383b274d
Fix value pointed to by _NSGetArgc() on macOS
2017-12-07 10:53:13 +00:00
Carlos O'Ryan
4aa05bd4ff
Only switch to g++-4.9 on Linux.
2017-12-06 22:43:39 -05:00
bryanzim
11d21b7c2a
Merge branch 'master' into master
2017-12-06 11:09:00 -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
Carlos O'Ryan
aea8580ecf
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
Romain Geissler
0663ce9024
Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both.
2017-12-02 22:47:20 +01: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
Scott Slack-Smith
6c093a2391
Merge branch 'master' of https://github.com/google/googletest
2017-11-24 16:00:56 +00:00
Bryan Zimmerman
a7269e24ac
replaced back accidently removed static_cast with consistent ImplicitCast_
2017-11-22 09:41:32 -05:00
Tanzinul Islam
4ba3803f93
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2017-11-19 20:17:46 +00: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
bryanzim
530885cbd5
Merge branch 'master' into master
2017-10-30 16:58:25 -04: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
Bryan Zimmerman
1ae4096b9c
fix for VS2017 deprecation of ::tr1::tuple
...
change static_cast to ImplicitCast_ for consitency
fixes for building with path names containing spaces
2017-10-27 14:01:16 -04: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
