Commit Graph

1555 Commits

Author SHA1 Message Date
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
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
Gennadiy Civil
06c3cce867 revert, lets get this compiled 2018-01-24 12:14:16 -05:00
Gennadiy Civil
ab9c44ccf0
Merge pull request #1410 from pcc/win-libcxx
Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
2018-01-24 12:07:16 -05:00
Gennadiy Civil
80defcec57 Many code merge/upstream changes 2018-01-23 12:33:54 -05:00
Gennadiy Civil
ad0146bfe2
Merge branch 'master' into win-libcxx 2018-01-23 12:32:44 -05:00
Gennadiy Civil
3c5e064ca0
Merge pull request #1417 from gennadiycivil/master
merges, cl/155419551 and others
2018-01-23 12:32:00 -05:00
Gennadiy Civil
58df576056 Merge branch 'master' of https://github.com/google/googletest 2018-01-23 10:16:38 -05:00
Gennadiy Civil
6723b6c588 Merging, upstream http://cl/182836545 2018-01-23 10:15:28 -05:00
Gennadiy Civil
bbb17ad0f7 more code merge 2018-01-22 15:28:55 -05:00
Gennadiy Civil
f1c87ad9f5 merges, cl/155419551 and other 2018-01-22 15:20:19 -05:00
Gennadiy Civil
83fa0cb17d
Merge pull request #1415 from gennadiycivil/master
code merge
2018-01-22 15:18:03 -05:00
Gennadiy Civil
9bc86661f8 more merging 2018-01-22 14:43:51 -05:00
Gennadiy Civil
a0435a54ce merging 2018-01-22 14:14:05 -05:00
Gennadiy Civil
8d707dfe81 code merge 2018-01-22 11:47:30 -05:00
Gennadiy Civil
62ba5d91d0
Merge pull request #1401 from eidosmontreal/support_xboxone
Added support for WINAPI_PARTITION_TV_TITLE to support XboxOne applications
2018-01-19 11:59:36 -05:00
Gennadiy Civil
1489dc8daa
Merge branch 'master' into support_xboxone 2018-01-18 17:42:34 -05:00
Gennadiy Civil
20b53ad786
Merge branch 'master' into win-libcxx 2018-01-18 17:41:36 -05:00
Gennadiy Civil
051053054d
Merge pull request #1412 from gennadiycivil/master
Adding python tests to Bazel build file.
2018-01-18 14:52:37 -05:00
Gennadiy Civil
b1623e9144 Adding python tests to Bazel build file. 2018-01-18 14:32:31 -05:00
Gennadiy Civil
8d733dc195
Merge pull request #1407 from ted-xp/master
Expose ScopedTrace utility in public interface
2018-01-18 09:47:22 -05:00