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

2965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Yursha
b756c6c48b Merge branch 'master' into patch-1 2017-09-13 15:59:32 -07:00
Gennadiy Civil
bc66d4ff3a 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
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
Alex Yursha
cc51b57db7 Merge branch 'master' into patch-1 2017-09-12 11:50:27 -07: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
Alex Yursha
4a74a92c89 Fix ellipsis position in examples 2017-09-08 17:20:59 -07:00
Gennadiy Civil
01e773e40b 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
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
eca7320e6c Merge branch 'master' into hethi/cleanup-travis-environment 2017-09-08 11:38:27 +02:00
Gennadiy Civil
aa77f8f490 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
e6818d7d97 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
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
Gennadiy Civil
838f2f6d16 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
51688dcc98 Merge branch 'master' into support_xboxone 2017-09-06 14:29:25 -04:00
Gennadiy Civil
845d0f4be3 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
a6c25a84f1 Merge branch 'master' into 2017_09_04_parametrized 2017-09-06 11:25:46 +01:00
Tanzinul Islam
f08a5baaf1 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2017-09-06 01:05:24 +01:00
Herbert Thielen
645317b7d3 remove unused variables from travis environment 2017-09-05 19:18:58 +02: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
Herbert Thielen
2e0281378f 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
2d1bdd7b09 reset ccache statistics at install 2017-09-05 16:36:23 +02:00
Herbert Thielen
8d94cdedb5 show ccache statistics in log 2017-09-05 16:36:23 +02:00
Herbert Thielen
28a92c63f3 call clang via ccache on Linux 2017-09-05 16:36:23 +02: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
Herbert Thielen
492c6f88b8 remove GTEST_HAS_PARAM_TESTS 
As mentioned in issue #360:
"Now that all the platforms gtest supports work with value-parameterized
tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from
the codebase everywhere."
https://github.com/google/googletest/issues/360
 2017-09-04 19:38:35 +02:00
Herbert Thielen
5fece522d2 limit processors to use in Travis build to 4 2017-09-04 18:56:52 +02:00
Herbert Thielen
8118aa8560 install ccache on travis osx build slave 2017-09-04 18:40:03 +02:00
Herbert Thielen
40ae7ae518 set MAKEFLAGS to use multiple processors on Travis CI 2017-09-04 18:19:06 +02:00
Herbert Thielen
aefdc2cb79 cache ccache 2017-09-04 17:37:58 +02:00
Herbert Thielen
78bace8938 avoid warning about unused variable 2017-09-04 17:23:41 +02:00
Herbert Thielen
be61455d8e 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
5287e7656f Add a non-parametrized test. 2017-09-04 15:46:31 +01:00
Bernhard Bauer
ea6279cb71 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
49752a2d36 treat all warnings as errors for GCC (-Werror) 2017-09-01 21:55:26 +02:00
Herbert Thielen
ce0a62f40f 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
93d050ea56 Merge pull request #900 from Gallaecio/patch-1 
Fix WhenSorted() documentation example
 2017-09-01 15:20:54 -04:00
Roman Lebedev
7e25cea458 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
e511ab1635 Merge pull request #783 from tobbi/cppcheck_perf_fixes 
Performance fixes reported by cppcheck
 2017-09-01 13:52:33 -04:00