3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2024-12-27 18:31:21 +08:00
Code Issues Projects Releases Wiki Activity
1,347 Commits 7 Branches 27 Tags 35 MiB
Commit Graph

1347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Gennadiy Civil
34aaf58c8b Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…" 2017-10-18 10:42:33 -04:00
Gennadiy Civil
5c9543547e Merge pull request #1297 from gennadiycivil/master 
Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…
 2017-10-18 10:40:53 -04:00
Gennadiy Civil
dfed97a69a Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552 2017-10-18 10:40:00 -04:00
Gennadiy Civil
3282f9ae01 Merge pull request #1288 from joealam/master 
Updated README with C runtime dynamic/static linking issues in Windows info
 2017-10-15 19:15:31 -07:00
Gennadiy Civil
963932e7f3 Merge pull request #1292 from DariuszOstolski/master 
#1282: Doc typo fix
 2017-10-15 19:14:33 -07:00
Dariusz Ostolski
ecb1c3ddb6 #1282: Doc typo fix 2017-10-14 18:33:19 +02:00
Joe Alam
4597ec587c Updated README with information about C runtime dynamic/static linking issues in Windows 2017-10-07 23:34:53 +01:00
Gennadiy Civil
7b6561c56e Merge pull request #1275 from jwakely/pr/1273 
Use gender-neutral pronouns in comments and docs
 2017-10-03 10:57:19 -04:00
Jonathan Wakely
b70cf1a663 Use gender-neutral pronouns in comments and docs 2017-09-27 13:31:13 +01:00
Gennadiy Civil
f1a87d73fc Merge pull request #1249 from stkhapugin/master 
Make TypeWithoutFormatter compatible with Objective-C++ with ARC.
 2017-09-23 16:21:02 -07:00
Gennadiy Civil
89f45180e0 Merge branch 'master' into master 2017-09-23 16:51:27 -04:00
Gennadiy Civil
bfc0ffc8a6 Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized 
Revert "Allow macros inside of parametrized test names."
 2017-09-21 10:54:35 -04:00
Gennadiy Civil
d30a37e743 Revert "Allow macros inside of parametrized test names." 2017-09-21 10:54:14 -04:00
Gennadiy Civil
ff6796877f Merge pull request #1245 from sheepmaster/2017_09_04_parametrized 
Allow macros inside of parametrized test names.
 2017-09-21 10:52:47 -04:00
Gennadiy Civil
4386393837 Merge pull request #1265 from bkircher/redundant-decl 
Remove redundant declaration
 2017-09-20 14:32:57 -04:00
stkhapugin@chromium.org
cf512a099c Swap reinterpret_cast for static_cast 
Swap reinterpret_cast for static_cast
 2017-09-19 12:44:52 +02:00
Benjamin Kircher
d4af64ca13 Remove redundant declaration 
TempDir() function is declared twice, once in `internal/gtest-port.h`
and a second time in `gtest.h`.

Fixes a warning with GCC when -Wredundant-decls is given.
 2017-09-16 11:51:36 +02:00
Gennadiy Civil
deace2546e Merge pull request #1259 from ly2048/patch-1 
Add explicit `CMAKE_DEBUG_POSTFIX` option
 2017-09-14 22:30:24 -04:00