Gennadiy Civil
54c2648bff
Workaround for Travis issue https://goo.gl/d5eV8o
2017-10-18 16:18:47 -04:00
Gennadiy Civil
dfed97a69a
Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552
2017-10-18 10:40:00 -04:00
Gennadiy Civil
3282f9ae01
Merge pull request #1288 from joealam/master
...
Updated README with C runtime dynamic/static linking issues in Windows info
2017-10-15 19:15:31 -07:00
Gennadiy Civil
963932e7f3
Merge pull request #1292 from DariuszOstolski/master
...
#1282 : Doc typo fix
2017-10-15 19:14:33 -07:00
Dariusz Ostolski
ecb1c3ddb6
#1282 : Doc typo fix
2017-10-14 18:33:19 +02:00
Joe Alam
4597ec587c
Updated README with information about C runtime dynamic/static linking issues in Windows
2017-10-07 23:34:53 +01:00
Gennadiy Civil
7b6561c56e
Merge pull request #1275 from jwakely/pr/1273
...
Use gender-neutral pronouns in comments and docs
2017-10-03 10:57:19 -04:00
Jonathan Wakely
b70cf1a663
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
Gennadiy Civil
f1a87d73fc
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
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