Gennadiy Civil
a8a2f4ab05
Merging, coniniue
2018-02-12 14:07:45 -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
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
Gennadiy Civil
a4e5067656
Reverting some changes, need to make the merge compile
2018-01-15 17:34:46 -05:00
Gennadiy Civil
8cd0c8c4da
Test files for corresponding changes
2018-01-15 17:15:52 -05:00
Gennadiy Civil
3c6e143b62
Test files for corresponding changes
2018-01-15 16:59:57 -05:00
Gennadiy Civil
0508f6d082
Test files for corresponding changes
2018-01-15 16:56:17 -05:00
Gennadiy Civil
338c211250
Test files for corresponding changes
2018-01-15 16:46:16 -05:00
Gennadiy Civil
c06b7f29cd
More code merges
2018-01-15 16:23:23 -05:00
Gennadiy Civil
153f625dd3
Code merging
2018-01-15 16:06:32 -05:00
gpetit
25a2ba9501
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2018-01-12 10:20:26 -05:00
Gennadiy Civil
9b205752b2
continue upstream/merge, etc
2018-01-11 17:36:34 -05:00
Gennadiy Civil
4c0c906987
Upstream cl 103120214
2018-01-11 11:31:23 -05:00
Gennadiy Civil
ee7f9fd88e
More merge, cleanup
2018-01-10 16:49:20 -05:00
Gennadiy Civil
4695a1108e
More merge, cleanup
2018-01-10 16:45:59 -05:00
