eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,006 Commits 13 Branches 14 Tags
Commit Graph

511 Commits

Author SHA1 Message Date
Gennadiy Civil
d70b7007c1 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-08 11:56:41 -05:00
bryanzim
5845063480 Merge branch 'master' into master 2017-12-08 11:31:31 -05:00
Wojciech Mamrak
8f178075b9 Remove C4996 warning in VS2017 2017-12-07 18:20:25 +01:00
Wojciech Mamrak
e858bd6b7c Improved description of VS std::tuple support 2017-12-07 18:17:43 +01:00
bryanzim
902957028b Merge branch 'master' into master 2017-12-06 11:09:00 -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
33a58b153e Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-12-01 16:31:29 -05:00
Gennadiy Civil
aa5aee1235 Merge branch 'master' into use-system-includes 2017-12-01 16:29:28 -05:00
Sam Lunt
332bd657f9 make includes system 2017-11-27 17:31:07 -06:00
Bryan Zimmerman
f305481536 replaced back accidently removed static_cast with consistent ImplicitCast_ 2017-11-22 09:41:32 -05:00
Gennadiy Civil
04c7a28aac Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-11-07 10:32:23 -08:00
whame
d3d85627fb Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output 2017-11-07 15:22:50 +01:00
bryanzim
c78cb68b2a Merge branch 'master' into master 2017-10-30 16:58:25 -04:00
Herbert Thielen
beabbc7da6 remove markdown stars (bold) from code examples 2017-10-29 17:12:00 +01:00
Bryan Zimmerman
bb417ab41e 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
m-gupta
30d58bcd31 Merge branch 'master' into gtestapifix 2017-10-25 10:24:56 -07: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
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
Joe Alam
6d61583e81 Updated README with information about C runtime dynamic/static linking issues in Windows 2017-10-07 23:34:53 +01:00
Herbert Thielen
79f678b5ad Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-10-04 21:03:47 +02:00
Jonathan Wakely
c61e22b1fe Use gender-neutral pronouns in comments and docs 2017-09-27 13:31:13 +01:00
Herbert Thielen
ab5371cb87 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-09-24 10:01:52 +02:00
Gennadiy Civil
e70be7be3d Merge branch 'master' into master 2017-09-23 16:51:27 -04:00
Gennadiy Civil
2b68b9b9ad Revert "Allow macros inside of parametrized test names." 2017-09-21 10:54:14 -04:00
Gennadiy Civil
d5417105dc 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
stkhapugin@chromium.org
01ac9679d1 Swap reinterpret_cast for static_cast 
Swap reinterpret_cast for static_cast
 2017-09-19 12:44:52 +02:00
Benjamin Kircher
136f0e272d 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
ly2048
9f2866e175 Add explicit CMAKE_DEBUG_POSTFIX option 
Enable generating different library name to be compatible with CMake's `FindGTest`.
 2017-09-14 13:22:04 +08:00
Alexey Sokolov
965be1c8ae Make the failure messages from EXPECT_EQ and friends actually symmetric, 
instead of reading more like reversing the former "expected" and "actual"
roles of the LHS and RHS arguments.

This patch is manually applied from internal version (125109873)
 2017-09-13 18:18:20 +01:00
Gennadiy Civil
7977a144d7 Merge pull request #1227 from aninf-wo/hethi/unused-import 
remove unused TestCase import
 2017-09-12 08:44:58 -04:00
Gennadiy Civil
20754de443 Merge pull request #1250 from aninf-wo/hethi/remove-linker-warning-on-non-existing-path 
remove obsolete link_directories command
 2017-09-11 12:15:11 -04:00
Gennadiy Civil
fc165a6b4c Merge branch 'master' into hethi/unused-import 2017-09-11 11:02:44 -04:00
Gennadiy Civil
822c567128 Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printf 
User logger GTEST_LOG instead of printf in gtest.cc to log errors
 2017-09-11 10:53:09 -04:00
Herbert Thielen
b029950a4f Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path 2017-09-08 11:47:45 +02:00
Herbert Thielen
d5b83c06cc Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-09-08 11:47:14 +02:00
Stepan Khapugin
db50987697 Merge branch 'master' into master 2017-09-08 11:46:31 +02:00
Herbert Thielen
746a069b2e Merge branch 'master' into hethi/unused-import 2017-09-08 11:45:58 +02:00
Herbert Thielen
c9ca8d74dd use GTEST_ATTRIBUTE_UNUSED_ instead of dummy function 2017-09-07 17:33:19 +02:00
Stepan Khapugin
1ab326f8cb Merge branch 'master' into master 2017-09-07 15:44:18 +02:00
Gasprd Petit
3ff6a5ee8b Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into user_logger_instead_of_printf 2017-09-07 07:49:00 -04:00
Gasprd Petit
6f5f718e2e Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is expected to abort() 2017-09-07 07:47:09 -04:00
Herbert Thielen
ca38ab5a51 Merge branch 'master' into hethi/travis-release-build 2017-09-07 11:05:28 +02:00
Bernhard Bauer
a6c25a84f1 Merge branch 'master' into 2017_09_04_parametrized 2017-09-06 11:25:46 +01:00
Gennadiy Civil
6cf47d4190 Merge pull request #975 from LebedevRI/respect-option 
CMake: use threads if allowed and found, not just if found.
 2017-09-05 13:07:37 -04:00
Stepan Khapugin
2d7d32d13c add a cast 2017-09-05 14:10:53 +02:00
Herbert Thielen
1e82add36c remove obsolete link_directories command 
It's not necessary, as the target_link_libraries command contains an
absolute path already, and the path given doesn't exist anymore,
leading only to linker warnings like:
ld: warning: directory not found for option
'-L/Users/travis/build/google/googletest/build/googlemock/gtest/src'
 2017-09-05 12:01:14 +02:00
Herbert Thielen
f73a2170d3 Merge branch 'master' into hethi/unused-import 2017-09-05 11:32:13 +02:00