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
Herbert Thielen
c86fbd766b
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-09-08 11:47:14 +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
8b491162f7
Merge branch 'master' into support_xboxone
2017-09-06 14:29:25 -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
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
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