3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-14 08:27:56 +08:00
Code Issues Projects Releases Wiki Activity
1,345 Commits 7 Branches 27 Tags 39 MiB
Commit Graph

1345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ly2048
b55abc3fe0 Merge branch 'master' into patch-1 2017-09-15 10:24:09 +08:00
Gennadiy Civil
b1dd47c278 Merge pull request #1255 from yursha/patch-1 
Fix ellipsis position in examples
 2017-09-14 11:10:51 -04:00
ly2048
9681b4c8e6 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
Alex Yursha
31b6155d7d Merge branch 'master' into patch-1 2017-09-13 15:59:32 -07:00
Gennadiy Civil
20e62ad24c Merge pull request #1242 from DarthGandalf/expect 
Make the failure messages from EXPECT_EQ and friends actually symmetric (reopen of #1101)
 2017-09-13 16:33:18 -04:00
Alexey Sokolov
c9cf07a8ba 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
Alex Yursha
834baf3362 Merge branch 'master' into patch-1 2017-09-12 11:50:27 -07:00
Gennadiy Civil
6133038886 Merge pull request #1227 from aninf-wo/hethi/unused-import 
remove unused TestCase import
 2017-09-12 08:44:58 -04:00
Gennadiy Civil
ecc5182dbd 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
eb695b0f11 Merge branch 'master' into hethi/unused-import 2017-09-11 11:02:44 -04:00
Gennadiy Civil
3663d67170 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
Alex Yursha
4f68ab5b84 Fix ellipsis position in examples 2017-09-08 17:20:59 -07:00
Gennadiy Civil
def0b32119 Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environment 
remove unused variables from travis environment
 2017-09-08 07:15:19 -04:00
Herbert Thielen
803ab9a860 Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path 2017-09-08 11:47:45 +02:00
Stepan Khapugin
6508a66622 Merge branch 'master' into master 2017-09-08 11:46:31 +02:00
Herbert Thielen
1b5b246ff9 Merge branch 'master' into hethi/unused-import 2017-09-08 11:45:58 +02:00
Herbert Thielen
8620328bca Merge branch 'master' into hethi/cleanup-travis-environment 2017-09-08 11:38:27 +02:00
Gennadiy Civil
894cdb82cb Merge pull request #1251 from aninf-wo/hethi/drop-valgrind-installation-on-travis 
drop unused valgrind package from Travis build slave installation
 2017-09-07 23:04:18 -04:00
Gennadiy Civil
f3500ce23a Merge pull request #1243 from aninf-wo/hethi/travis-release-build 
switch one Trevis build to Release mode
 2017-09-07 23:03:09 -04:00
Herbert Thielen
6c0146fd00 use GTEST_ATTRIBUTE_UNUSED_ instead of dummy function 2017-09-07 17:33:19 +02:00
Stepan Khapugin
e43a5948d5 Merge branch 'master' into master 2017-09-07 15:44:18 +02:00
Gasprd Petit
900cc4bca5 Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into user_logger_instead_of_printf 2017-09-07 07:49:00 -04:00
Gasprd Petit
f6dde80e94 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
bc60b5a827 Merge branch 'master' into hethi/travis-release-build 2017-09-07 11:05:28 +02:00
Gennadiy Civil
a33b6b0919 Merge pull request #1246 from aninf-wo/hethi/enable-travis-gcc-cache 
enable Travis ccache to speed up CI builds
 2017-09-06 16:52:22 -04:00
Gennadiy Civil
8a3ccc3ee3 Merge pull request #1247 from aninf-wo/hethi/enable-parallel-builds 
run parallelized builds on Travis CI
 2017-09-06 14:27:07 -04:00
Bernhard Bauer
a92c362cfb Merge branch 'master' into 2017_09_04_parametrized 2017-09-06 11:25:46 +01:00
Herbert Thielen
be94bf501e remove unused variables from travis environment 2017-09-05 19:18:58 +02:00
Gennadiy Civil
857ddeadeb 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
Herbert Thielen
beca85ff4a drop unused valgrind package from installation 
... and remove explicit gcc installation (will be installed with g++
automatically)
 2017-09-05 17:39:04 +02:00
Herbert Thielen
dd8e4a6358 reset ccache statistics at install 2017-09-05 16:36:23 +02:00
Herbert Thielen
56f8222a14 show ccache statistics in log 2017-09-05 16:36:23 +02:00
Herbert Thielen
83d8dd0e9c call clang via ccache on Linux 2017-09-05 16:36:23 +02:00
Stepan Khapugin
9a8794faed add a cast 2017-09-05 14:10:53 +02:00
Herbert Thielen
e8c6942ac1 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
88b76525dd Merge branch 'master' into hethi/unused-import 2017-09-05 11:32:13 +02:00
Herbert Thielen
fe97312e24 limit processors to use in Travis build to 4 2017-09-04 18:56:52 +02:00
Herbert Thielen
98f2f15253 install ccache on travis osx build slave 2017-09-04 18:40:03 +02:00
Herbert Thielen
d96a038e8b set MAKEFLAGS to use multiple processors on Travis CI 2017-09-04 18:19:06 +02:00
Herbert Thielen
48b0662880 cache ccache 2017-09-04 17:37:58 +02:00
Herbert Thielen
55fd999adf avoid warning about unused variable 2017-09-04 17:23:41 +02:00
Herbert Thielen
8abacca52e avoid -Wshadow warning on GCC 
When using INSTANTIATE_TEST_CASE_P with a lambda function which uses
'info' as parameter name, GCC complains that this would shadow
parameter 'info' used in the macro's VA_ARGS call.
 2017-09-04 17:18:16 +02:00
Bernhard Bauer
86e5f0083e Add a non-parametrized test. 2017-09-04 15:46:31 +01:00
Bernhard Bauer
e7c9e80e63 Allow macros inside of parametrized test names. 
This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling.
 2017-09-04 15:46:31 +01:00
Herbert Thielen
520ad96b78 treat all warnings as errors for GCC (-Werror) 2017-09-01 21:55:26 +02:00
Herbert Thielen
d15b8b4524 switch one build to Release mode 
This turns on optimization which allows the compiler to discover more
problems and omit some more warnings.
 2017-09-01 21:55:11 +02:00
Gennadiy Civil
7c6353d29a Merge pull request #900 from Gallaecio/patch-1 
Fix WhenSorted() documentation example
 2017-09-01 15:20:54 -04:00
Roman Lebedev
1a62d1b088
CMake: use threads if allowed and found, not just if found. 
If the user's cmakelists.txt first look for threads using
find_package(Threads), then set(gtest_disable_pthreads ON),
and then include googletest. GoogleTest will not look for
threads. But since they have already been found before in
user's cmakelists, it will use them regardless.

This helped me fix build issue in darktable-org/rawspeed
on windows/MSYS2, even though there are threads, and they
are usable, googletest build was failing with issues
about AutoHandle. I was first looking for threads, and only
then including googletest, so no matter the value of
gtest_disable_pthreads, it failed.

The other obvious solution is for user to first include
googletest, and only then look for threads by himself.
 2017-09-01 21:02:59 +03:00
Gennadiy Civil
52b6ca3428 Merge pull request #783 from tobbi/cppcheck_perf_fixes 
Performance fixes reported by cppcheck
 2017-09-01 13:52:33 -04:00
Gennadiy Civil
e4f6c0b358 Merge pull request #1011 from zeitounator/wrong-version-reported 
Wrong version reported (1.7.0 should be 1.8.0)
 2017-09-01 13:38:26 -04:00
Gennadiy Civil
b3a1f87f0c Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-type 
use cmake build type defined in .travis.yml for travis builds
 2017-09-01 10:07:43 -04:00
Gennadiy Civil
ee53b281ba Merge branch 'master' into user_logger_instead_of_printf 2017-09-01 00:05:22 -04:00