zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,301 Commits 10 Branches 30 Tags
89f45180e02cf04b2b044ffc19f5ca8f599fb438
Commit Graph
1301 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil 89f45180e0 Merge branch 'master' into master 2017-09-23 16:51:27 -04:00
Gennadiy Civil bfc0ffc8a6 Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized 
Revert "Allow macros inside of parametrized test names."
 2017-09-21 10:54:35 -04:00
Gennadiy Civil d30a37e743 Revert "Allow macros inside of parametrized test names." 2017-09-21 10:54:14 -04:00
Gennadiy Civil ff6796877f Merge pull request #1245 from sheepmaster/2017_09_04_parametrized 
Allow macros inside of parametrized test names.
 2017-09-21 10:52:47 -04:00
Gennadiy Civil 4386393837 Merge pull request #1265 from bkircher/redundant-decl 
Remove redundant declaration
 2017-09-20 14:32:57 -04:00
stkhapugin@chromium.org cf512a099c Swap reinterpret_cast for static_cast 
Swap reinterpret_cast for static_cast
 2017-09-19 12:44:52 +02:00
Benjamin Kircher d4af64ca13 Remove redundant declaration 
TempDir() function is declared twice, once in `internal/gtest-port.h`
and a second time in `gtest.h`.

Fixes a warning with GCC when -Wredundant-decls is given.
 2017-09-16 11:51:36 +02:00
Gennadiy Civil deace2546e Merge pull request #1259 from ly2048/patch-1 
Add explicit `CMAKE_DEBUG_POSTFIX` option
 2017-09-14 22:30:24 -04:00
ly2048 b55abc3fe0 Merge branch 'master' into patch-1 2017-09-15 10:24:09 +08:00
Gennadiy Civil b1dd47c278 Merge pull request #1255 from yursha/patch-1 
Fix ellipsis position in examples
 2017-09-14 11:10:51 -04:00
ly2048 9681b4c8e6 Add explicit CMAKE_DEBUG_POSTFIX option 
Enable generating different library name to be compatible with CMake's `FindGTest`.
 2017-09-14 13:22:04 +08:00
Alex Yursha 31b6155d7d Merge branch 'master' into patch-1 2017-09-13 15:59:32 -07:00
Gennadiy Civil 20e62ad24c 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 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
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 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 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