eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,326 Commits 13 Branches 14 Tags 23 MiB
6b060a7e30
Commit Graph

1326 Commits

Author SHA1 Message Date
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 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
845d0f4be3 Merge pull request 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
Herbert Thielen
645317b7d3 remove unused variables from travis environment 2017-09-05 19:18:58 +02:00
Gennadiy Civil
6cf47d4190 Merge pull request 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
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 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 from tobbi/cppcheck_perf_fixes 
Performance fixes reported by cppcheck
 2017-09-01 13:52:33 -04:00
Gennadiy Civil
4126de54a7 Merge pull request 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
7da2ee170f Merge pull request 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
aa5f5b1482 Merge branch 'master' into user_logger_instead_of_printf 2017-09-01 00:05:22 -04:00
Gennadiy Civil
b6bf0fd3c0 Merge pull request from KindDragon/mingw64-appveyour 
AppVeyor MinGW-w64 test build
 2017-09-01 00:04:34 -04:00
Arkady Shapkin
c6f12cb3f8 Merge branch 'master' into mingw64-appveyour 2017-09-01 03:02:47 +03:00
Gennadiy Civil
219f518967 Merge pull request from aninf-wo/hethi/issue-635-old-links 
change links from former code.google.com to current github repository
 2017-08-31 18:28:19 -04:00
Arkady Shapkin
d12eb73c8d Merge branch 'master' into mingw64-appveyour 2017-08-31 23:05:00 +03:00
Herbert Thielen
3adc6067bc Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 20:51:49 +02:00
Herbert Thielen
b34d59baf1 change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
Gennadiy Civil
96145f5a53 Merge pull request from aninf-wo/hethi/fix-faq-example-comment 
fix example's comment
 2017-08-31 12:10:49 -04:00
Gennadiy Civil
7a6e33b359 Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 11:13:09 -04:00
Herbert Thielen
58fd2df28b Merge branch 'master' into hethi/fix-faq-example-comment 2017-08-31 16:12:27 +02:00
Herbert Thielen
ab657cdfa6 fix example's comment 2017-08-31 16:10:36 +02:00
Gennadiy Civil
cb4c337a26 Merge pull request from frosteyes/master 
Moved the ignoring of *.pyc files to top level
 2017-08-31 09:13:07 -04:00
Che-Hsun Liu
4c7ce5780f Merge branch 'master' into master 2017-08-31 19:02:12 +08:00
Claus Stovgaard
68622227af Merge remote-tracking branch 'github_google/master' into master-github_frosteyes 
# Conflicts:
#	.gitignore
 2017-08-31 12:22:53 +02:00
Herbert Thielen
03c8948894 Merge branch 'master' into hethi/unused-import 2017-08-31 11:39:56 +02:00
Herbert Thielen
8a4a9bcf15 Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 08:47:26 +02:00
Gennadiy Civil
731894ae3e Merge pull request from aninf-wo/hethi/travis-unused-cmake 
remove non-existing gmock_build_samples switch
 2017-08-30 22:18:24 -04:00
Arkadiy Shapkin
6ffdce4cc7 AppVeyor MinGW-w64 test build 2017-08-31 01:16:02 +03:00
Gennadiy Civil
8567479df0 Merge pull request from sgraham/update-docs-3 
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change
 2017-08-30 17:29:43 -04:00