Commit Graph

2240 Commits

Author SHA1 Message Date
Gennadiy Civil
30d276da03 cxxx11 2018-02-13 11:48:32 -05:00
Gennadiy Civil
3b1fe3ec45 clang warnings 2018-02-13 11:24:09 -05:00
Gennadiy Civil
d7c966c4de clang warnings 2018-02-13 11:15:03 -05:00
Gennadiy Civil
2a23ca0009 https://travis-ci.org/google/googletest/jobs/340995238 2018-02-13 11:05:01 -05:00
Gennadiy Civil
a66d209061 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' 2018-02-13 10:23:42 -05:00
Gennadiy Civil
e76f4ee9fd clang warning https://travis-ci.org/google/googletest/jobs/340978022 2018-02-13 10:05:43 -05:00
Gennadiy Civil
9e072812e3 merges 2018-02-13 09:45:12 -05:00
Gennadiy Civil
9d1a80c0fb
Merge pull request #1452 from gennadiycivil/master
moving JoinAsTuple to internal
2018-02-12 16:57:08 -05:00
Gennadiy Civil
1a7732a488 Merge branch 'master' of https://github.com/google/googletest 2018-02-12 16:42:43 -05:00
Gennadiy Civil
225e6741ac moving JoinAsTuple to internal 2018-02-12 16:42:12 -05:00
Victor Costan
b3a1759eac Fix std::iscntrl use in gtest-printers.cc
ContainsUnprintableControlCodes() in gtest-printers.cc passes a char
argument to std::iscntrl. Although its argument is an int, std::iscntrl
produces undefined behavior if its argument is not representable as an
unsigned char. The standard library on Windows asserts that the argument
is an unsigned char, resulting in an assertion crash on debug builds.
2018-02-12 13:02:07 -08:00
Gennadiy Civil
222607a019
Merge pull request #1451 from gennadiycivil/master
merges
2018-02-12 14:33:35 -05:00
Gennadiy Civil
b94ba27d44 Merge branch 'master' of https://github.com/google/googletest 2018-02-12 14:08:17 -05:00
Gennadiy Civil
d84f58ab10 Merging, coniniue 2018-02-12 14:07:45 -05:00
Conor Burgess
f11a8f9131
Merge branch 'master' into fix-argc 2018-02-12 17:35:07 +00:00
Gennadiy Civil
15392f1a38
Merge pull request #1449 from gennadiycivil/master
merges
2018-02-10 00:01:49 -05:00
Gennadiy Civil
575c081227 merging 2018-02-09 17:45:10 -05:00
Gennadiy Civil
49fc378e0a merges 2018-02-09 16:02:17 -05:00
Gennadiy Civil
9737e63c69
Merge pull request #1439 from DarthGandalf/assert
Add ability to throw from ASSERT
2018-02-09 13:06:22 -05:00
Gennadiy Civil
b324a36c35
Merge branch 'master' into assert 2018-02-09 11:42:05 -05:00
Gennadiy Civil
22a115055a
Merge pull request #1446 from tholsapp/master
Fixed typos
2018-02-09 11:34:26 -05:00
Gennadiy Civil
c211f21906
Merge pull request #1448 from gennadiycivil/master
merges
2018-02-09 11:00:35 -05:00
Gennadiy Civil
ec7faa943d merges 2018-02-09 10:41:09 -05:00
Troy Holsapple
c8510504dd Fixed typos 2018-02-07 22:06:00 -08:00
Alexey Sokolov
092d088533 Add ability to throw from ASSERT
while not losing benefits of EXPECT, and not killing the whole test,
as with --gtest_throw_on_failure.

183822976
2018-02-08 01:15:42 +00:00
Gennadiy Civil
a3c73ed28d
Include MSVC14 on PRs as well 2018-02-06 11:06:11 -05:00
Gennadiy Civil
ea31cb15f0
Merge pull request #1435 from gennadiycivil/master
Code merges
2018-01-31 15:52:06 -05:00
Gennadiy Civil
e6ec8bc52f Merges and also adding new bazel build mode 2018-01-31 12:05:18 -05:00
Gennadiy Civil
e55fded0c8 Code merges 2018-01-30 17:34:22 -05:00
Gennadiy Civil
a1923a59d5
Merge pull request #1434 from gennadiycivil/master
Ability to optionally depend on Abseil plus upstream of 183716547
2018-01-30 13:53:48 -05:00
Gennadiy Civil
2a4683021a Ability to optionally depend on Abseil plus upstream of 183716547 2018-01-30 11:42:03 -05:00
Gennadiy Civil
798cc4a78a
Merge pull request #1430 from gennadiycivil/master
Adding tests to googlemock bazel
2018-01-29 09:35:22 -05:00
Gennadiy Civil
6c0c389601 Adding tests to googlemock bazel 2018-01-26 16:30:57 -05:00
Gennadiy Civil
718fd88d8f
Merge pull request #1429 from gennadiycivil/master
Code merges
2018-01-26 12:22:48 -05:00
Gennadiy Civil
92c93802e1 Merge branch 'master' of https://github.com/google/googletest 2018-01-26 11:58:17 -05:00
Gennadiy Civil
fbb48a7708 Code merges 2018-01-26 11:57:58 -05:00
Gennadiy Civil
cb7271697b
Merge pull request #1428 from lidaobing/patch-2
Update Documentation.md
2018-01-26 10:50:22 -05:00
Gennadiy Civil
aa82c6f14b
Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0
Fix test build issue with GCC7.2 (with -Wno-error=)
2018-01-26 10:48:44 -05:00
LI Daobing
efd49c2d45
Update Documentation.md 2018-01-26 15:36:57 +08:00
Stefano Soffia
b8ac390a57 Fix test build issue with GCC7.2. 2018-01-25 23:19:57 +01:00
Peter Collingbourne
3498a1ac52 Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
_HAS_EXCEPTIONS is specific to the MSVC STL and defining it to 0 causes
problems with libc++, so libc++ users may leave it undefined. This can
cause GTEST_HAS_EXCEPTIONS to be defined incorrectly if the user has
disabled exceptions via the compiler, which can lead to build errors.

_CPPUNWIND is a builtin macro provided by the compiler so it should
work with both STLs.
2018-01-25 14:15:43 -08:00
Peter Collingbourne
f915530791 Pass -EHs-c- to disable exceptions with MSVC. 2018-01-25 14:15:43 -08:00
Gennadiy Civil
b3a2048beb
Update README.md 2018-01-25 10:12:56 -05:00
Gennadiy Civil
7cced896a0
Remove Visual Studio 10,11,12 from build matrix 2018-01-25 09:58:51 -05:00
Gennadiy Civil
46ab9ecf1f
Merge pull request #1421 from gennadiycivil/master
upstream cl 182543808
2018-01-24 16:31:29 -05:00
Gennadiy Civil
b9651c04ef placating gcc and its overzeauls size comparison warnings 2018-01-24 16:06:08 -05:00
Gennadiy Civil
264ba3e68e Merge branch 'master' of https://github.com/google/googletest 2018-01-24 14:59:43 -05:00
Gennadiy Civil
21cf836003
Merge pull request #1418 from gennadiycivil/master
Many code merge/upstream changes
2018-01-24 14:57:08 -05:00
Gennadiy Civil
e29805aa5d upstream cl 182543808 2018-01-24 13:04:36 -05:00
Gennadiy Civil
7a2563a514 Merge branch 'master' of https://github.com/google/googletest 2018-01-24 12:36:05 -05:00