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

1302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
cd8f5d1729 Merge pull request #1249 from stkhapugin/master 
Make TypeWithoutFormatter compatible with Objective-C++ with ARC.
 2017-09-23 16:21:02 -07:00
Gennadiy Civil
e70be7be3d Merge branch 'master' into master 2017-09-23 16:51:27 -04:00
Gennadiy Civil
cb96b29bb2 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
2b68b9b9ad Revert "Allow macros inside of parametrized test names." 2017-09-21 10:54:14 -04:00
Gennadiy Civil
d5417105dc 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
bf3f6befd6 Merge pull request #1265 from bkircher/redundant-decl 
Remove redundant declaration
 2017-09-20 14:32:57 -04:00
stkhapugin@chromium.org
01ac9679d1 Swap reinterpret_cast for static_cast 
Swap reinterpret_cast for static_cast
 2017-09-19 12:44:52 +02:00
Benjamin Kircher
136f0e272d 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
9c493d0b5f Merge pull request #1259 from ly2048/patch-1 
Add explicit `CMAKE_DEBUG_POSTFIX` option
 2017-09-14 22:30:24 -04:00
ly2048
2d5fe17429 Merge branch 'master' into patch-1 2017-09-15 10:24:09 +08:00
Gennadiy Civil
03e5ea6635 Merge pull request #1255 from yursha/patch-1 
Fix ellipsis position in examples
 2017-09-14 11:10:51 -04:00
ly2048
9f2866e175 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
b756c6c48b Merge branch 'master' into patch-1 2017-09-13 15:59:32 -07:00
Gennadiy Civil
bc66d4ff3a 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
965be1c8ae 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
cc51b57db7 Merge branch 'master' into patch-1 2017-09-12 11:50:27 -07:00
Gennadiy Civil
7977a144d7 Merge pull request #1227 from aninf-wo/hethi/unused-import 
remove unused TestCase import
 2017-09-12 08:44:58 -04:00
Gennadiy Civil
20754de443 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
fc165a6b4c Merge branch 'master' into hethi/unused-import 2017-09-11 11:02:44 -04:00
Gennadiy Civil
822c567128 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
4a74a92c89 Fix ellipsis position in examples 2017-09-08 17:20:59 -07:00
Gennadiy Civil
01e773e40b 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
b029950a4f Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path 2017-09-08 11:47:45 +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
eca7320e6c Merge branch 'master' into hethi/cleanup-travis-environment 2017-09-08 11:38:27 +02:00
Gennadiy Civil
aa77f8f490 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
e6818d7d97 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
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
Gennadiy Civil
838f2f6d16 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
845d0f4be3 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
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 #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
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