1025 Commits

Author SHA1 Message Date
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
Bernhard Bauer
a92c362cfb Merge branch 'master' into 2017_09_04_parametrized 2017-09-06 11:25:46 +01:00
Tanzinul Islam
78b1ff0747 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2017-09-06 01:05:24 +01: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
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
aa0b5458a1 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
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
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
Gennadiy Civil
836c194a81 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
2a720ac1bb Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 20:51:49 +02:00
Herbert Thielen
e033d8c73d change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
Gennadiy Civil
7f27d8bdd1 Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 11:13:09 -04:00
Herbert Thielen
84bd72ba3c Merge branch 'master' into hethi/fix-faq-example-comment 2017-08-31 16:12:27 +02:00
Herbert Thielen
14cf7f574a fix example's comment 2017-08-31 16:10:36 +02:00
Che-Hsun Liu
3eaba9f07c Merge branch 'master' into master 2017-08-31 19:02:12 +08:00
Claus Stovgaard
34355c0e87 Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
# Conflicts:
#	.gitignore
2017-08-31 12:22:53 +02:00
Herbert Thielen
1a8ba67414 Merge branch 'master' into hethi/unused-import 2017-08-31 11:39:56 +02:00
Herbert Thielen
d6c46ebd04 Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 08:47:26 +02:00
Herbert Thielen
cfcc89a84a Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-30 21:46:30 +02:00
Gennadiy Civil
fa70b84ab5 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
c4e01616af removed internal link ( not allowed in OSS) 2017-08-30 14:50:40 -04:00
Scott Graham
0eb49f4d6b Note that it is preferable for Googlers to create a CL internally first 2017-08-30 11:29:06 -07:00
Gennadiy Civil
bb1c4af487 Merge branch 'master' into master 2017-08-30 14:11:38 -04:00
Herbert Thielen
9ba7946bde create different python based tests for single and multi configuration build generators 2017-08-30 19:17:26 +02:00
Gennadiy Civil
4db9a748e3 Merge branch 'master' into hethi/unused-import 2017-08-30 11:47:32 -04:00
Herbert Thielen
47ad2993b6 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
73d58dd4c8 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
7529c8aa05 remove obsolete comment regarding python tests on linux 2017-08-30 12:48:28 +02:00
Herbert Thielen
f0c72bfe09 fix SetUp/TearDownTestCase() in AdvancedGuide
fixes issue #1087
2017-08-30 12:19:59 +02:00
Herbert Thielen
d6562b5a57 Merge branch 'master' into hethi/unused-import 2017-08-30 10:44:26 +02:00
Scott Graham
c3d1d33560 Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA 2017-08-29 12:45:26 -07:00
Herbert Thielen
b567aadd1b remove unused TestCase import 2017-08-29 14:27:10 +02:00
Herbert Thielen
daaed2b6cb fix typo in comment and string (SetUpTestCase) 2017-08-29 14:22:09 +02:00
Brian Silverman
4d26df729c Speed up printing of characters which need hex escaping
This change speeds up the runtime of a value-parameterized test I have
which has lots of values with large strings full of unprintable
characters by 2x. I profiled it and traced most of the slowness during
googletest startup down to the way String::FormatHexInt was creating and
destroyed a stringstream for each character in the string for each
value.
2017-08-28 16:00:48 -04:00
Arkady Shapkin
45287f3dff Remove gtest VS2005 projects 2017-08-25 01:57:35 +03:00
Gennadiy Civil
87327b12e9 Merge branch 'master' into master 2017-08-23 14:27:55 -04:00
Arkady Shapkin
88269cd365 Support x64 configuration for old VS2010 projects
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
2017-08-23 01:45:44 +03:00