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
Tanzinul Islam
f08a5baaf1
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2017-09-06 01:05:24 +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
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
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
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
Gennadiy Civil
4126de54a7
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
7da2ee170f
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
aa5f5b1482
Merge branch 'master' into user_logger_instead_of_printf
2017-09-01 00:05:22 -04:00
Gennadiy Civil
219f518967
Merge pull request #1241 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
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
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
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
Herbert Thielen
af793011f5
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-30 21:46:30 +02:00
Gennadiy Civil
3c58954dec
Removed "Trivial"
...
Who knows? may not be very trivial given the code drift between internal and OSS
2017-08-30 14:51:36 -04:00
Gennadiy Civil
76b0a834a5
removed internal link ( not allowed in OSS)
2017-08-30 14:50:40 -04:00
Scott Graham
63faadca89
Note that it is preferable for Googlers to create a CL internally first
2017-08-30 11:29:06 -07:00
Gennadiy Civil
d5525cdcf8
Merge branch 'master' into master
2017-08-30 14:11:38 -04:00
Herbert Thielen
081b1448ef
create different python based tests for single and multi configuration build generators
2017-08-30 19:17:26 +02:00
Gennadiy Civil
32ee817f35
Merge branch 'master' into hethi/unused-import
2017-08-30 11:47:32 -04:00
Herbert Thielen
cd0574c396
Revert "ask cmake for per-configuration output subdir"
...
This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e.
Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't
help here.
2017-08-30 15:14:34 +02:00
Herbert Thielen
4a0b472571
ask cmake for per-configuration output subdir
...
On single-configuration build systems as Makefile Generators, there is
no subdirectory for the configuration in the build tree - therefore ask
cmake for the subdir by using CMAKE_CFG_INTDIR, which is just '.' on
single-configuration build systems (Linux et al.).
2017-08-30 12:59:06 +02:00
Herbert Thielen
b0af69a1d7
remove obsolete comment regarding python tests on linux
2017-08-30 12:48:28 +02:00
Herbert Thielen
abb93b4f57
fix SetUp/TearDownTestCase() in AdvancedGuide
...
fixes issue #1087
2017-08-30 12:19:59 +02:00
Herbert Thielen
5a1c936e9e
Merge branch 'master' into hethi/unused-import
2017-08-30 10:44:26 +02:00
Scott Graham
4476885245
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA
2017-08-29 12:45:26 -07:00
Herbert Thielen
ad0e3af8a3
remove unused TestCase import
2017-08-29 14:27:10 +02:00
