Gennadiy Civil
75c7d791aa
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 14:56:31 -05:00
Gennadiy Civil
551f80ffcb
cleanup/merges
2018-02-13 14:56:05 -05:00
Gennadiy Civil
dd527171f1
Merge pull request #1457 from gennadiycivil/master
...
merging, cleaning up
2018-02-13 14:51:34 -05:00
Gennadiy Civil
729d6dc865
merging, cleaning up
2018-02-13 14:13:52 -05:00
Gennadiy Civil
30667546c1
Merge pull request #1456 from gennadiycivil/master
...
merges
2018-02-13 14:13:16 -05:00
Gennadiy Civil
a5e9795dee
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 13:50:52 -05:00
Gennadiy Civil
516a39cda7
merges
2018-02-13 13:49:57 -05:00
Gennadiy Civil
d82a4d2722
Merge pull request #1454 from gennadiycivil/master
...
merges
2018-02-13 12:26:47 -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
Gennadiy Civil
1bee0353f4
Merge pull request #1452 from gennadiycivil/master
...
moving JoinAsTuple to internal
2018-02-12 16:57:08 -05:00
Gennadiy Civil
f96b4424a6
Merge branch 'master' of https://github.com/google/googletest
2018-02-12 16:42:43 -05:00
Gennadiy Civil
d40efb1166
moving JoinAsTuple to internal
2018-02-12 16:42: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
8ab6f1655d
Merge pull request #1451 from gennadiycivil/master
...
merges
2018-02-12 14:33:35 -05:00
Gennadiy Civil
174fc3ac42
Merge branch 'master' of https://github.com/google/googletest
2018-02-12 14:08:17 -05: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
2556472cbc
Merge pull request #1449 from gennadiycivil/master
...
merges
2018-02-10 00:01:49 -05: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
1943612969
Merge pull request #1439 from DarthGandalf/assert
...
Add ability to throw from ASSERT
2018-02-09 13:06:22 -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
504a8d3ad4
Merge pull request #1448 from gennadiycivil/master
...
merges
2018-02-09 11:00:35 -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
8170693de6
Include MSVC14 on PRs as well
2018-02-06 11:06:11 -05:00
Gennadiy Civil
5ff6cf13ea
Merge pull request #1435 from gennadiycivil/master
...
Code merges
2018-01-31 15:52:06 -05: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
6a913cadb6
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
735ae77a8f
Ability to optionally depend on Abseil plus upstream of 183716547
2018-01-30 11:42:03 -05:00
Gennadiy Civil
a9d9277584
Merge pull request #1430 from gennadiycivil/master
...
Adding tests to googlemock bazel
2018-01-29 09:35:22 -05:00
Gennadiy Civil
8a3cd4124e
Adding tests to googlemock bazel
2018-01-26 16:30:57 -05:00
Gennadiy Civil
baa26e0aab
Merge pull request #1429 from gennadiycivil/master
...
Code merges
2018-01-26 12:22:48 -05:00
Gennadiy Civil
7e5d65a589
Merge branch 'master' of https://github.com/google/googletest
2018-01-26 11:58:17 -05:00
Gennadiy Civil
05c81235a1
Code merges
2018-01-26 11:57:58 -05:00
Gennadiy Civil
f287af772e
Merge pull request #1428 from lidaobing/patch-2
...
Update Documentation.md
2018-01-26 10:50:22 -05:00
Gennadiy Civil
f9cb555edb
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
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
