930 Commits

Author SHA1 Message Date
Gennadiy Civil
551f80ffcb cleanup/merges 2018-02-13 14:56:05 -05:00
Gennadiy Civil
729d6dc865 merging, cleaning up 2018-02-13 14:13:52 -05:00
Gennadiy Civil
516a39cda7 merges 2018-02-13 13:49:57 -05:00
Gennadiy Civil
ccc4035c99 cxxx11 2018-02-13 11:48:32 -05:00
Gennadiy Civil
70e74eb482 clang warnings 2018-02-13 11:24:09 -05:00
Gennadiy Civil
95ecbcbb86 clang warnings 2018-02-13 11:15:03 -05:00
Gennadiy Civil
f9ab8f86bb https://travis-ci.org/google/googletest/jobs/340995238 2018-02-13 11:05:01 -05:00
Gennadiy Civil
95cd910e81 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' 2018-02-13 10:23:42 -05:00
Gennadiy Civil
7164a54bd4 clang warning https://travis-ci.org/google/googletest/jobs/340978022 2018-02-13 10:05:43 -05:00
Gennadiy Civil
ee0e251fe3 merges 2018-02-13 09:45:12 -05:00
Victor Costan
04f97d9c86 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
a8a2f4ab05 Merging, coniniue 2018-02-12 14:07:45 -05:00
Conor Burgess
771a5479db Merge branch 'master' into fix-argc 2018-02-12 17:35:07 +00:00
Gennadiy Civil
2c7e37af6f merging 2018-02-09 17:45:10 -05:00
Gennadiy Civil
2848f99c65 merges 2018-02-09 16:02:17 -05:00
Gennadiy Civil
c6e347c75f Merge branch 'master' into assert 2018-02-09 11:42:05 -05:00
Gennadiy Civil
521a3dcbfe Merge pull request #1446 from tholsapp/master
Fixed typos
2018-02-09 11:34:26 -05:00
Gennadiy Civil
1fb2e10cfe merges 2018-02-09 10:41:09 -05:00
Troy Holsapple
a2866dfdf5 Fixed typos 2018-02-07 22:06:00 -08:00
Alexey Sokolov
d20708cf0b 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
d9df92287e Merges and also adding new bazel build mode 2018-01-31 12:05:18 -05:00
Gennadiy Civil
9f2c3d4cac Code merges 2018-01-30 17:34:22 -05:00
Gennadiy Civil
735ae77a8f Ability to optionally depend on Abseil plus upstream of 183716547 2018-01-30 11:42:03 -05:00
Gennadiy Civil
f287af772e Merge pull request #1428 from lidaobing/patch-2
Update Documentation.md
2018-01-26 10:50:22 -05:00
LI Daobing
38205c4554 Update Documentation.md 2018-01-26 15:36:57 +08:00
Stefano Soffia
c669fb4384 Fix test build issue with GCC7.2. 2018-01-25 23:19:57 +01:00
Peter Collingbourne
bf92c203ea 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
69205e815e Pass -EHs-c- to disable exceptions with MSVC. 2018-01-25 14:15:43 -08:00
Gennadiy Civil
52f02b8a99 placating gcc and its overzeauls size comparison warnings 2018-01-24 16:06:08 -05:00
Gennadiy Civil
6da2cd7c70 upstream cl 182543808 2018-01-24 13:04:36 -05:00
Gennadiy Civil
9bee111e03 Merge branch 'master' of https://github.com/google/googletest 2018-01-24 12:36:05 -05:00
Gennadiy Civil
c8ffb81dbc revert, lets get this compiled 2018-01-24 12:14:16 -05:00
Gennadiy Civil
bfd2406f79 Many code merge/upstream changes 2018-01-23 12:33:54 -05:00
Gennadiy Civil
370cdcdcba Merge branch 'master' into win-libcxx 2018-01-23 12:32:44 -05:00
Gennadiy Civil
84fcb3339a Merging, upstream http://cl/182836545 2018-01-23 10:15:28 -05:00
Gennadiy Civil
d54b4ce548 more code merge 2018-01-22 15:28:55 -05:00
Gennadiy Civil
325bdd33f3 merges, cl/155419551 and other 2018-01-22 15:20:19 -05:00
Gennadiy Civil
c2c9847d5a more merging 2018-01-22 14:43:51 -05:00
Gennadiy Civil
3cd811bb4a merging 2018-01-22 14:14:05 -05:00
Gennadiy Civil
0e18369f97 code merge 2018-01-22 11:47:30 -05:00
Gennadiy Civil
7e2564f4cf Merge branch 'master' into support_xboxone 2018-01-18 17:42:34 -05:00
Gennadiy Civil
f2c8ff56a9 Merge branch 'master' into win-libcxx 2018-01-18 17:41:36 -05:00
Gennadiy Civil
67915e6edb Adding python tests to Bazel build file. 2018-01-18 14:32:31 -05:00
Fedor Trushkin
60922662fe Use fully qualified in examples 2018-01-18 10:38:25 +01:00
Fedor Trushkin
920639122c Document ScopedTrace utility 2018-01-18 10:34:05 +01:00
Peter Collingbourne
4185169167 Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
If _MSC_VER is defined, it means that we are using the Microsoft
ABI, so cxxabi.h (which is associated with the Itanium ABI) will not
be available.
2018-01-17 20:29:10 -08:00
Fedor Trushkin
4e1156e10c Expose ScopedTrace utility in public interface 2018-01-17 16:41:59 +01:00
Gennadiy Civil
81b270392c Reverting some changes, need to make the merge compile 2018-01-15 18:16:11 -05:00
Gennadiy Civil
01e9531d3e Reverting some changes, need to make the merge compile 2018-01-15 17:39:33 -05:00
Gennadiy Civil
9faac7603b Reverting some changes, need to make the merge compile 2018-01-15 17:36:45 -05:00