eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,975 Commits 13 Branches 14 Tags
Commit Graph

2975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
03e20771e6 Merge pull request #1395 from gennadiycivil/master 
code merge, cleanups
 2018-01-10 11:59:44 -05:00
Gennadiy Civil
e7c35b2539 revert googletest/test/gtest-param-test_test.cc 2018-01-10 11:04:49 -05:00
Gennadiy Civil
67bbe10978 Merge branch 'master' of github.com:gennadiycivil/googletest 2018-01-10 10:57:37 -05:00
Gennadiy Civil
2d3fab795d Merge branch 'master' of https://github.com/google/googletest 2018-01-10 10:57:21 -05:00
Gennadiy Civil
6c52b2b73a Merge branch 'master' into master 2018-01-10 10:42:25 -05:00
Gennadiy Civil
a3736d2166 Update .travis.yml 2018-01-10 10:20:09 -05:00
Gennadiy Civil
bdf3cfb0f4 Merge branch 'master' of https://github.com/google/googletest 2018-01-09 22:47:12 -05:00
Gennadiy Civil
28368f8f74 code merge, cleanups 2018-01-09 22:46:17 -05:00
Gennadiy Civil
45069e9e31 Merge pull request #1394 from gennadiycivil/master 
wip, cleanups/merge
 2018-01-09 20:22:14 -05:00
Gennadiy Civil
9b54fda880 Upstream of cl 129104714 2018-01-09 16:41:15 -05:00
Gennadiy Civil
062f5f05b3 Revert one file 2018-01-09 15:46:44 -05:00
Gaspard Petit
ab9d22d454 Merge branch 'master' into support_xboxone 2018-01-09 15:22:30 -05:00
Gennadiy Civil
823b5a8545 wip, cleanups/merge 2018-01-09 14:48:06 -05:00
Gennadiy Civil
f328db661a Merge pull request #1393 from gennadiycivil/master 
cleanup, merge
 2018-01-09 14:45:55 -05:00
Gennadiy Civil
2a8d1eabc0 Merge branch 'master' into master 2018-01-09 14:00:25 -05:00
Gennadiy Civil
00b42ec5c3 cleanup, merge 2018-01-09 13:59:27 -05:00
Gennadiy Civil
7b54e1227c Merge branch 'master' into fix-core-dump-shared 2018-01-09 00:22:32 -05:00
Gennadiy Civil
f858df5aab Merge pull request #1388 from rongjiecomputer/bazel 
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
 2018-01-08 22:07:26 -05:00
Loo Rong Jie
15605813a5 [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
a0270937d6 Merge pull request #1390 from gennadiycivil/master 
Small cleanups, merge
 2018-01-08 17:10:16 -05:00
Gennadiy Civil
59c57226dc Small cleanups, merge 2018-01-08 16:14:06 -05:00
Gennadiy Civil
0698036d29 Merge pull request #1387 from coryan/optimize-build-matrix-ready 
Optimize build matrix on pull requests
 2018-01-08 10:50:13 -05:00
Gennadiy Civil
65eb0d3fe2 Merge pull request #1385 from gennadiycivil/master 
code cleanup in preparation for merges, cl 180857299
 2018-01-06 00:02:40 -05:00
Gennadiy Civil
40c3187116 Merge branch 'master' into master 2018-01-05 15:34:07 -05:00
Carlos O'Ryan
a7db01b2c0 Use correct name for build event types. 2018-01-05 14:58:48 -05:00
Gennadiy Civil
88a9c878c2 Revert one file for now 2018-01-05 12:35:41 -05:00
Carlos O'Ryan
5cf3fcb741 Fixed test for pull request. 2018-01-05 11:01:37 -05:00
Gennadiy Civil
325314ac2f Merge pull request #1007 from davidben/missing-declarations 
Pass the -Wmissing-declarations warning.
 2018-01-05 10:18:26 -05:00
Carlos O'Ryan
923d6785c7 Fixed output and test for 'enabled_on_pr' 2018-01-05 09:32:50 -05:00
Gennadiy Civil
9c7e25968e Merge branch 'master' into missing-declarations 2018-01-04 22:01:38 -05:00
Gennadiy Civil
bf08b69717 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
a359be3711 code cleanup in preparation for merges, cl 180857299 2018-01-04 21:49:27 -05:00
Carlos O'Ryan
545271e30d Optimize build matrix (#1) 
Disable expensive builds on pull requests.
 2018-01-04 13:04:31 -05:00
Gennadiy Civil
e93ccf922d Merge pull request #1378 from gennadiycivil/master 
upstreaming cl 124976692
 2018-01-04 12:17:46 -05:00
Gennadiy Civil
c8518ae0cb Merge branch 'master' into master 2018-01-04 10:13:00 -05:00
Gennadiy Civil
b4b096bdef Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule 
Run autoconf from top-level directory.
 2018-01-03 17:06:31 -05:00
Gennadiy Civil
ce9c285a6c upstreaming cl 124976692 2018-01-03 16:57:05 -05:00
David Benjamin
e7beafb2b1 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
53c478d639b8eebd2942e88266610ebc79c541f6), define
GTEST_ATTRIBUTE_PRINTF_ in clang-cl too.
 2018-01-03 14:55:52 -05:00
David Benjamin
57561c06f0 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
4146dcfb8d Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2018-01-03 14:15:14 -05:00
Gennadiy Civil
4c7697a958 Merge pull request #1374 from davidben/tuple-msvc 
Fix testing::Combine on MSVC 2017.
 2018-01-03 14:11:38 -05:00
Gennadiy Civil
5caedf5c38 Merge pull request #991 from davidben/uintptr 
Pass MSVC's C4826 warning.
 2018-01-03 14:10:29 -05:00
Gennadiy Civil
e6bcc9e722 Merge branch 'master' into tuple-msvc 2018-01-03 13:04:37 -05:00
Gennadiy Civil
7a649860fd Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2018-01-03 12:51:09 -05:00
Samuel Benzaquen
f8b8123ccd Merge pull request #1376 from gennadiycivil/master 
OSS Sync, cl 163329677
 2018-01-03 12:40:56 -05:00
misterg
0ee1e9fccd OSS Sync, cl 163329677 2018-01-02 14:42:09 -05:00
David Benjamin
ce7f204275 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
98024c8cfd Merge branch 'master' into uintptr 2018-01-02 10:54:26 -05:00
Gennadiy Civil
03cb857238 Merge pull request #1109 from davidben/vs2017 
Avoid warning C4619 in MSVC 2017.
 2018-01-02 10:51:37 -05:00
Tanzinul Islam
9510b96a18 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2017-12-31 00:55:13 +00:00