Anders Sundman (asum)
11e1dd257b
Removed trailing comma in enum
2018-02-23 14:55:24 +01:00
Aleksey Kozin
99bb4fe85a
Merge branch 'master' into patch-1
2018-02-23 01:38:54 +03:00
Gennadiy Civil
a490fb7a9a
Merge pull request #1466 from pwnall/fix-death-warn
...
Fix unused function warning on Mac OS.
2018-02-22 17:37:41 -05:00
Aleksey Kozin
06568301ec
TEST() arguments are invalid in an example
...
Both names must be valid C++ identifiers, and they should not contain underscore (`_`)
2018-02-23 01:34:26 +03:00
Gennadiy Civil
ac138b6885
Merge branch 'master' into fix-death-warn
2018-02-22 16:34:27 -05:00
Gennadiy Civil
32e62da22a
Merge pull request #1469 from gennadiycivil/master
...
merges
2018-02-22 16:09:17 -05:00
Gennadiy Civil
df65632489
merges
2018-02-22 15:53:14 -05:00
Victor Costan
8a6158717b
Fix unused function warning on Mac OS.
...
As of recently, Google Test fails to compile with the warning below when
used in projects with strict warning settings.
googletest/src/gtest-death-test.cc:1004:13: error: unused function 'StackGrowsDown' [-Werror,-Wunused-function]
2018-02-19 02:02:59 -08:00
Gennadiy Civil
3f0cf6b62a
Merge pull request #1450 from pwnall/fix-printers
...
Fix std::iscntrl use in gtest-printers.cc
2018-02-15 17:24:19 -05:00
Gennadiy Civil
8dd1eb5984
Merge branch 'master' into fix-printers
2018-02-15 15:41:39 -05:00
Gennadiy Civil
42140509b6
Merge pull request #1459 from gennadiycivil/master
...
cleanup, merges
2018-02-13 16:04:47 -05:00
Gennadiy Civil
8248169287
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 15:26:07 -05:00
Gennadiy Civil
a3e322b24f
cleanup, merges
2018-02-13 15:25:57 -05:00
Gennadiy Civil
0d6a674f61
Merge pull request #1458 from gennadiycivil/master
...
cleanup, merges
2018-02-13 15:24:31 -05:00
Gennadiy Civil
823f139bc7
Merge branch 'master' into fix-printers
2018-02-13 15:00:07 -05:00
Gennadiy Civil
68e4f076e5
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 14:56:31 -05:00
Gennadiy Civil
09581b3852
cleanup/merges
2018-02-13 14:56:05 -05:00
Gennadiy Civil
38611c5121
Merge pull request #1457 from gennadiycivil/master
...
merging, cleaning up
2018-02-13 14:51:34 -05:00
Gennadiy Civil
069724197c
merging, cleaning up
2018-02-13 14:13:52 -05:00
Gennadiy Civil
462ef92f75
Merge pull request #1456 from gennadiycivil/master
...
merges
2018-02-13 14:13:16 -05:00
Gennadiy Civil
64290752e9
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 13:50:52 -05:00
Gennadiy Civil
ab186a8c49
merges
2018-02-13 13:49:57 -05:00
Gennadiy Civil
ffc5f5ad3c
Merge pull request #1454 from gennadiycivil/master
...
merges
2018-02-13 12:26:47 -05:00
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
