eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,219 Commits 13 Branches 14 Tags 23 MiB
9dae300121
Commit Graph

634 Commits

Author SHA1 Message Date
James Dennett
49ecebd1f2
Downgrade to C++98. 
Some projects cannot handle C++11 yet.
 2018-05-21 12:27:52 -07:00
James Dennett
ec2c911b33
Downgrade to C++98 code. 
Some users are not ready for C++11 yet.
 2018-05-21 10:59:24 -07:00
James Dennett
89286a4cdf
Merge branch 'master' into StdLibVersioning 2018-05-21 10:57:01 -07:00
Tanzinul Islam
3280099951 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-05-13 11:42:21 +01:00
Fabrice de Gans-Riberi
f91bf75cf9 Remove unused variable in Fuchsia. 2018-05-11 10:38:48 -07:00
James Dennett
54e331b88b
Add support for versioned standard libraries. 
This canonicalizes demangled names by omitting a nested inline namespace within namespace std if the name of the nested namespace begins with a double underscore.  This improves compatibility with libc++.
 2018-05-10 22:39:19 -07:00
James Dennett
fc66ae45fc
Update generated code. 2018-05-10 22:36:50 -07:00
James Dennett
b8fa4d2754
Add unit test for CanonicalizeForStdLibVersioning. 2018-05-10 22:33:29 -07:00
Jae Heon Lee
18abd8f512 Use NULL instead of nullptr, for pre-C++11 builds. 2018-05-09 13:03:57 -07:00
Jae Heon Lee
ec5ad0f869 Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively. 2018-05-07 14:09:37 -07:00
Tanzinul Islam
10f05a627c Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-05-05 19:53:33 +01:00
Fabrice de Gans-Riberi
960149f913 Remove magic number 2018-05-03 13:57:51 -07:00
Fabrice de Gans-Riberi
242f0f623c Style fix 2018-05-03 13:44:42 -07:00
Fabrice de Gans-Riberi
8497540f39 Fix comments 2018-05-03 13:42:31 -07:00
Fabrice de Gans-Riberi
13af91faff Fix more stuff and get tests to pass 2018-05-03 12:06:45 -07:00
Fabrice de Gans-Riberi
96c3c422ad Get all the things to work. 2018-05-02 14:57:56 -07:00
Fabrice de Gans-Riberi
b6cb5c3e40 Fix stuff 2018-05-01 18:43:55 -07:00
Fabrice de Gans-Riberi
d4b5281d11 Add Fuchsia support for death test. 2018-05-01 16:22:09 -07:00
Gennadiy Civil
c13ab6003b merging 2018-04-11 13:20:36 -04:00
Gennadiy Civil
6f9db26159 merging 2018-04-10 16:34:21 -04:00
Gennadiy Civil
9bc82ce725 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil
39c58da187 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
e1071eb949 RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 2018-04-10 15:57:16 -04:00
Gennadiy Civil
ca54b67303
Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil
c1d4c34233 this should be it 2018-04-09 16:13:45 -04:00
Gennadiy Civil
f5871009e6 yet more 2018-04-09 16:04:48 -04:00
Gennadiy Civil
05b5a53898 formatting 2018-04-09 15:50:19 -04:00
Gennadiy Civil
57d6e824b4 more 2018-04-09 15:33:56 -04:00
Gennadiy Civil
cb13dc759c more warnings 2018-04-06 11:26:12 -04:00
Gennadiy Civil
d9f3611a22 more MSVC warnings 2018-04-06 11:17:45 -04:00
Henry Fredrick Schreiner
b22e8dec40 Clean up cache non-advanced variable for subproject 2018-04-05 13:40:26 +02:00
Gennadiy Civil
fbe3c94533
Merge branch 'master' into fix_locale_win 2018-04-04 13:58:55 -04:00
fo40225
a0c27bd8a5 fix build break on locale windows 2018-04-04 23:16:16 +08:00
Gennadiy Civil
1776ed8c1e Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl 2018-04-04 11:06:09 -04:00
Gennadiy Civil
98687b7847
Merge branch 'master' into int3 2018-04-03 16:31:59 -04:00
Gennadiy Civil
18be012457
Merge branch 'master' into int3 2018-04-03 16:27:32 -04:00
Gennadiy Civil
d52aaee8eb Upstreaming, cl 191344765 2018-04-03 16:14:35 -04:00
Gennadiy Civil
27507429cb
Merge branch 'master' into int3 2018-04-03 11:44:23 -04:00
Gennadiy Civil
a2dd136578 merging port, cont. 191443078 2018-04-03 11:38:30 -04:00
Gennadiy Civil
aa349acb07 merging, cont - 2 2018-04-03 11:23:54 -04:00
Gennadiy Civil
2cedd5b9c1 merging gtest-port.h , 191439094 2018-04-03 11:06:20 -04:00
Gennadiy Civil
04d1e56bd2 merging, just comments format 2018-04-03 09:56:23 -04:00
Gennadiy Civil
5beb452bbe testing, merge 2018-04-03 09:45:49 -04:00
Gennadiy Civil
df5a48da03 Testing, gtest-port.h merge 2018-04-03 09:31:10 -04:00
Gennadiy Civil
87a4cdddd0 merging gtest-port.h, again - 1 2018-04-02 14:22:24 -04:00
Tanzinul Islam
5c7c365d5f Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-04-01 13:43:57 +01:00
Roland Leißa
b1d18b85bd
Merge branch 'master' into int3 2018-03-30 03:16:20 +02:00
Gennadiy Civil
b2373c6f51
Revert "merging gtest-port 1 of N" 2018-03-29 13:28:29 -04:00
Gennadiy Civil
54bb165ffd
Revert "merging gtest-port, 2" 2018-03-29 13:27:11 -04:00
Roland Leißa
e10ea42274 Merge remote-tracking branch 'google/master' into int3 2018-03-29 16:39:40 +02:00
Roland Leißa
d04bf07fad typo 2018-03-29 16:38:23 +02:00
Gennadiy Civil
8e0364a37b merging gtest-port, 2 2018-03-29 09:46:13 -04:00
Roland Leißa
11855d8ef0 provide alternative for DebugBreak() 
This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
 2018-03-28 23:45:51 +02:00
Gennadiy Civil
aea6fc32aa merging gtest-port 1 of N 2018-03-27 15:19:40 -04:00
Gennadiy Civil
a75a5c9706 merges 1 2018-03-26 13:14:00 -04:00
Gennadiy Civil
3df7cbe6f7 merges, gtest 2018-03-26 13:04:28 -04:00
Gennadiy Civil
4e89c76db8 reverting gtest_list_tests_unittest.py 2018-03-22 12:37:38 -04:00
Gennadiy Civil
da71e8c870 more merges 2018-03-22 10:58:18 -04:00
Gennadiy Civil
0f6567954f more merges 2018-03-22 10:56:35 -04:00
Gennadiy Civil
691e38e518 More merges 2018-03-21 16:31:31 -04:00
Gennadiy Civil
a3c2e107ae cl 189032107, again 2018-03-16 15:56:31 -04:00
Gennadiy Civil
080fcbe0aa cl 189032107 2018-03-16 13:36:36 -04:00
Gennadiy Civil
a178cc7ef7 merge, again, IsRecursiveContainer 2018-03-15 14:31:37 -04:00
Gennadiy Civil
262aaf2f1d erging, cont 2018-03-14 10:49:18 -04:00
Gennadiy Civil
2814b4b089 merging, merging 2018-03-13 16:02:05 -04:00
Gennadiy Civil
a719320a3c fixing, was removing too much 2018-03-13 11:53:27 -04:00
Gennadiy Civil
5461f63d01 Merge branch 'master' of https://github.com/google/googletest 2018-03-13 11:13:58 -04:00
Gennadiy Civil
af463c43ac More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Bernhard Bauer
fc437ef4b2
Merge branch 'master' into upstream_188748737 2018-03-12 18:15:35 +00:00
Bernhard Bauer
7b70413e0c Allow macros inside of parametrized test names. 
This allows doing things like TEST_P(TestFixture, MAYBE(TestName))
for nicer conditional test disabling.

Upstream of cr/188748737.

Tested:
Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
 2018-03-12 18:14:06 +00:00
Gennadiy Civil
cf9d6344d2 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil
e891900666 Merging, XML tests 2018-03-07 15:57:55 -05:00
Gennadiy Civil
89d6f70f34 merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil
995a9dfa69 merges-7 2018-03-05 15:21:48 -05:00
Gennadiy Civil
086825de5d merges-6 2018-03-05 14:21:41 -05:00
Gennadiy Civil
8385928428 merges-3 2018-03-05 13:51:39 -05:00
Gennadiy Civil
a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil
0d5e01ad7b Merges-1 2018-03-05 12:26:15 -05:00
Tanzinul Islam
a7a7f51d35
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-03-05 02:25:59 +00:00
Petr Hosek
7a2050d4d7 Use a full message in the JSON output for failures 
The full message unlike summary also includes stack trace.
 2018-03-01 13:19:34 -08:00
Gennadiy Civil
3817871beb
Merge branch 'master' into json 2018-02-28 14:39:17 -05:00
Gennadiy Civil
66d71756a7
Merge branch 'master' into debug-postfix 2018-02-28 08:43:57 -05:00
Petr Hosek
6baf17e9d1 Support JSON output format in addition to XML 
This change allows emitting output in JSON format in addition to the
already supported XML format. The implementation as well as the file
structure is intentionally modelled after the XML one.
 2018-02-28 00:48:41 -08:00
Gennadiy Civil
ce61dc54a2
Merge pull request #1423 from pcc/win-libcxx2 
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
 2018-02-27 14:00:29 -05:00
Gennadiy Civil
ab46d9550b
Merge branch 'master' into debug-postfix 2018-02-27 13:19:35 -05:00
Victor Costan
84ec2e0365 Switch default death test style back to "fast". 
Google Test has recently (02/09/2018) switched the default death test
style from "fast" to "threadsafe" in
ec7faa943d

Threadsafe death tests have been used internally for a while, and are
proven to be a better default.

However, adopting this better default can be challenging for large
projects with a significant investment in custom infrastructure built on
top of Google Test. The same custom infrastructure can make it difficult
for large projects to switch back to the old default by passing in
--gtest_death_test_style=fast.

For the reasons above, the default switch is considered too disruptive,
and this CL reverts it. This CL also introduces the
GTEST_DEFAULT_DEATH_TEST_STYLE preprocesor macro, which replaces the
hard-coded default. The macro can be defined in
gtest/internal/custom/gtest-port.h by projects that are ready to migrate
to thread-safe death tests.
 2018-02-27 07:50:03 -08:00
Gennadiy Civil
d4f77c1e3a
Merge branch 'master' into win-libcxx2 2018-02-27 10:00:29 -05:00
David Neto
20074be19a Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX 
CMAKE_DEBUG_POSTFIX is a global configuration parameter, and
changing it pollutes the configuration space for other projects
that enclose this project.

DEBUG_POSTFIX is better to use since it is a target-specific poperty.

Fixes #1334
Fixes #1268
 2018-02-26 15:58:49 -05:00
Gennadiy Civil
aa31660d18
Merge branch 'master' into master 2018-02-26 11:14:34 -05:00
Gennadiy Civil
4dbb437174 merging unittests - 5 2018-02-26 09:51:27 -05:00
Gennadiy Civil
004f6a00b2 merging unitests - check 4 2018-02-23 15:27:11 -05:00
Gennadiy Civil
29e9ca8774 merging unitests, check 2018-02-23 11:29:35 -05:00
Gennadiy Civil
3299a2386c merging unittests - 2 2018-02-23 11:07:18 -05:00
Gennadiy Civil
b7e0294c51 merging unitests 2018-02-23 10:47:11 -05:00
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
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
8dd1eb5984
Merge branch 'master' into fix-printers 2018-02-15 15:41:39 -05:00
Gennadiy Civil
a3e322b24f cleanup, merges 2018-02-13 15:25:57 -05:00
Gennadiy Civil
823f139bc7
Merge branch 'master' into fix-printers 2018-02-13 15:00:07 -05:00
Gennadiy Civil
09581b3852 cleanup/merges 2018-02-13 14:56:05 -05:00
Gennadiy Civil
069724197c merging, cleaning up 2018-02-13 14:13:52 -05:00
Gennadiy Civil
ab186a8c49 merges 2018-02-13 13:49:57 -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
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
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
575c081227 merging 2018-02-09 17:45:10 -05:00
Gennadiy Civil
49fc378e0a merges 2018-02-09 16:02:17 -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
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
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
2a4683021a Ability to optionally depend on Abseil plus upstream of 183716547 2018-01-30 11:42:03 -05:00
Gennadiy Civil
cb7271697b
Merge pull request #1428 from lidaobing/patch-2 
Update Documentation.md
 2018-01-26 10:50:22 -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
Peter Collingbourne
3498a1ac52 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
f915530791 Pass -EHs-c- to disable exceptions with MSVC. 2018-01-25 14:15:43 -08:00
Gennadiy Civil
b9651c04ef placating gcc and its overzeauls size comparison warnings 2018-01-24 16:06: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
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
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
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
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
b1623e9144 Adding python tests to Bazel build file. 2018-01-18 14:32:31 -05:00
Fedor Trushkin
8e862211a2 Use fully qualified in examples 2018-01-18 10:38:25 +01:00
Fedor Trushkin
354fc8d8b1 Document ScopedTrace utility 2018-01-18 10:34:05 +01:00
Peter Collingbourne
ba99a04be2 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
9c82e7745c Expose ScopedTrace utility in public interface 2018-01-17 16:41:59 +01:00
Gennadiy Civil
08b323f717 Reverting some changes, need to make the merge compile 2018-01-15 18:16:11 -05:00
Gennadiy Civil
9195571c69 Reverting some changes, need to make the merge compile 2018-01-15 17:39:33 -05:00
Gennadiy Civil
6d04de7419 Reverting some changes, need to make the merge compile 2018-01-15 17:36:45 -05:00
Gennadiy Civil
b9e297838d Reverting some changes, need to make the merge compile 2018-01-15 17:34:46 -05:00
Gennadiy Civil
304be8f009 Test files for corresponding changes 2018-01-15 17:15:52 -05:00
Gennadiy Civil
6befe422f2 Test files for corresponding changes 2018-01-15 16:59:57 -05:00
Gennadiy Civil
f45c22c482 Test files for corresponding changes 2018-01-15 16:56:17 -05:00
Gennadiy Civil
5f4ce9d884 Test files for corresponding changes 2018-01-15 16:46:16 -05:00
Gennadiy Civil
d629744ec0 More code merges 2018-01-15 16:23:23 -05:00
Gennadiy Civil
da1f7fe1e7 Code merging 2018-01-15 16:06:32 -05:00
Conor Burgess
27bb844e5c
Merge branch 'master' into fix-argc 2018-01-12 16:00:39 +00:00
gpetit
33d73d42b4 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne 2018-01-12 10:20:26 -05:00
Gennadiy Civil
93b77987f5 continue upstream/merge, etc 2018-01-11 17:36:34 -05:00
Gennadiy Civil
6914ae2394 Upstream cl 103120214 2018-01-11 11:31:23 -05:00
Gennadiy Civil
1d757db65c More merge, cleanup 2018-01-10 16:49:20 -05:00
Gennadiy Civil
481fe9446a More merge, cleanup 2018-01-10 16:45:59 -05:00
Gennadiy Civil
6a26e47cfc Code merge, upstreaming accumulated changes, cleanup 2018-01-10 14:42:29 -05:00
Gennadiy Civil
62dbaa2947 revert 2018-01-10 14:00:52 -05:00
Gennadiy Civil
d630a8bdac code merges, cleanup 2018-01-10 13:58:00 -05:00
Gennadiy Civil
f33902b97a revert googletest/test/gtest-param-test_test.cc 2018-01-10 11:04:49 -05:00
Gennadiy Civil
d237297ceb code merge, cleanups 2018-01-09 22:46:17 -05:00
Gennadiy Civil
2ad5661db2 Upstream of cl 129104714 2018-01-09 16:41:15 -05:00
Gennadiy Civil
5eecadf67a Revert one file 2018-01-09 15:46:44 -05:00
Gennadiy Civil
9fce984a67 wip, cleanups/merge 2018-01-09 14:48:06 -05:00
Gennadiy Civil
1df907381d
Merge branch 'master' into master 2018-01-09 14:00:25 -05:00
Gennadiy Civil
258fd6e168 cleanup, merge 2018-01-09 13:59:27 -05:00
Loo Rong Jie
cbd15d417e [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc 
and x64_windows_msvc
 2018-01-09 08:29:44 +08:00
Gennadiy Civil
91ba05cc36 Small cleanups, merge 2018-01-08 16:14:06 -05:00
Gennadiy Civil
fab06101d7
Merge branch 'master' into master 2018-01-05 15:34:07 -05:00
Gennadiy Civil
67476c1426 Revert one file for now 2018-01-05 12:35:41 -05:00
Gennadiy Civil
6b4967a23a
Merge branch 'master' into missing-declarations 2018-01-04 22:01:38 -05:00
Gennadiy Civil
abbc0f8174
Merge pull request #1377 from davidben/clang-cl 
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
 2018-01-04 21:59:48 -05:00
Gennadiy Civil
19b5774ccf code cleanup in preparation for merges, cl 180857299 2018-01-04 21:49:27 -05:00
Gennadiy Civil
4216f869f7
Merge branch 'master' into master 2018-01-04 10:13:00 -05:00
Gennadiy Civil
1c09831acc upstreaming cl 124976692 2018-01-03 16:57:05 -05:00
David Benjamin
1acf8c752e Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl. 
clang-cl is clang for Windows running in MSVC mode. Chromium uses it for
Windows builds. clang-cl is weird in that it defines __clang__ and
_MSC_VER, but *NOT* __GNUC__. This is vaguely analogous to how normal
clang defines __clang__ (what it is) and __GNUC__ (what it is compatible
with).

However, clang-cl still implements most GCC extensions, being clang.
Notably, the way to control -Wformat-literal is still with
__attribute__((__format__)). For better error-checking and strict
-Wformatl-literal compatibility (see
53c478d639), define
GTEST_ATTRIBUTE_PRINTF_ in clang-cl too.
 2018-01-03 14:55:52 -05:00
David Benjamin
b3d9be5c1d Pass the -Wmissing-declarations warning. 
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
 2018-01-03 14:50:22 -05:00
Gennadiy Civil
26addade17
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2018-01-03 14:15:14 -05:00
Gennadiy Civil
ba6ecedede
Merge pull request #1374 from davidben/tuple-msvc 
Fix testing::Combine on MSVC 2017.
 2018-01-03 14:11:38 -05:00
Gennadiy Civil
88760a299f
Merge pull request #991 from davidben/uintptr 
Pass MSVC's C4826 warning.
 2018-01-03 14:10:29 -05:00
Gennadiy Civil
a3da63d97a
Merge branch 'master' into tuple-msvc 2018-01-03 13:04:37 -05:00
Gennadiy Civil
a9fa67cbe4
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2018-01-03 12:51:09 -05:00
misterg
e7734fb80c OSS Sync, cl 163329677 2018-01-02 14:42:09 -05:00
David Benjamin
90244a6aef Fix testing::Combine on MSVC 2017. 
On platforms with std::tuple and not std::tr1::tuple, GTEST_HAS_COMBINE
gets turned off when it works fine (due to GTEST_TUPLE_NAMESPACE_).
Elsewhere in the project, several GTEST_HAS_TR1_TUPLE checks
additionally check GTEST_HAS_STD_TUPLE_, so use that formulation.

(The ones that don't are specific to std::tr1::tuple and are followed by
an identical GTEST_HAS_STD_TUPLE_ version underneath it.)

In particular, this fixes testing::Combine on MSVC 2017, which regressed
here:
https://github.com/google/googletest/pull/1348#issuecomment-353879010
 2018-01-02 12:57:49 -05:00
Gennadiy Civil
fa6730103e
Merge branch 'master' into uintptr 2018-01-02 10:54:26 -05:00
David Benjamin
bcd35523cd Avoid warning C4619 in MSVC 2017. 
C4800 has since been removed in MSVC 2017, so trying to silence it
throws warning C4619 when enabled.
 2017-12-25 11:02:02 -05:00
Gennadiy Civil
e76c3f837c
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-22 14:47:25 -05:00
Gregory Pakosz
7990f56637 Re-enable MSVC++ C4389 warning in CmdHelperEq() 
C4389 was inhibited in commit 4b83461 making behavior inconsistent with
other compilers.
 2017-12-21 16:35:38 +01:00
bryanzim
e17907da80
Update internal_utils.cmake 2017-12-20 10:06:20 -05:00