eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,450 Commits 13 Branches 14 Tags 23 MiB
d630a8bdac
Commit Graph

1450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f729a2867e Merge branch 'master' of github.com:gennadiycivil/googletest 2018-01-10 10:57:37 -05:00
Gennadiy Civil
8034001188 Merge branch 'master' of https://github.com/google/googletest 2018-01-10 10:57:21 -05:00
Gennadiy Civil
505de1d6e2
Merge branch 'master' into master 2018-01-10 10:42:25 -05:00
Gennadiy Civil
6eccdb7b62
Update .travis.yml 2018-01-10 10:20:09 -05:00
Gennadiy Civil
2f31bfab6b Merge branch 'master' of https://github.com/google/googletest 2018-01-09 22:47:12 -05:00
Gennadiy Civil
d237297ceb code merge, cleanups 2018-01-09 22:46:17 -05:00
Gennadiy Civil
509e78be23
Merge pull request #1394 from gennadiycivil/master 
wip, cleanups/merge
 2018-01-09 20:22:14 -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
2301524923
Merge pull request #1393 from gennadiycivil/master 
cleanup, merge
 2018-01-09 14:45:55 -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
Gennadiy Civil
e194f52114
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
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
c3bb0ee2a6
Merge pull request #1390 from gennadiycivil/master 
Small cleanups, merge
 2018-01-08 17:10:16 -05:00
Gennadiy Civil
91ba05cc36 Small cleanups, merge 2018-01-08 16:14:06 -05:00
Gennadiy Civil
3d27bdef53
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
4371b996ed
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
fab06101d7
Merge branch 'master' into master 2018-01-05 15:34:07 -05:00
Carlos O'Ryan
67d6e46728
Use correct name for build event types. 2018-01-05 14:58:48 -05:00
Gennadiy Civil
67476c1426 Revert one file for now 2018-01-05 12:35:41 -05:00
Carlos O'Ryan
adfdc65ca7
Fixed test for pull request. 2018-01-05 11:01:37 -05:00
Gennadiy Civil
5b26b0fce7
Merge pull request #1007 from davidben/missing-declarations 
Pass the -Wmissing-declarations warning.
 2018-01-05 10:18:26 -05:00
Carlos O'Ryan
d3acb4ba18
Fixed output and test for 'enabled_on_pr' 2018-01-05 09:32:50 -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
Carlos O'Ryan
9cee677ce4
Optimize build matrix (#1) 
Disable expensive builds on pull requests.
 2018-01-04 13:04:31 -05:00
Gennadiy Civil
be6ee26a9b
Merge pull request #1378 from gennadiycivil/master 
upstreaming cl 124976692
 2018-01-04 12:17:46 -05:00
Gennadiy Civil
4216f869f7
Merge branch 'master' into master 2018-01-04 10:13:00 -05:00
Gennadiy Civil
a5014476f0
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
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
Samuel Benzaquen
1414d71af0
Merge pull request #1376 from gennadiycivil/master 
OSS Sync, cl 163329677
 2018-01-03 12:40:56 -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
Gennadiy Civil
1c2f190704
Merge pull request #1109 from davidben/vs2017 
Avoid warning C4619 in MSVC 2017.
 2018-01-02 10:51:37 -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
Carlos O'Ryan
ec2b0c3912
Build both googletest and googlemock. 2017-12-24 12:22:46 -05:00
Carlos O'Ryan
75b85d5382
Create a autotools-based build for Travis. 
When this build works, we know the autoconf support is working.
 2017-12-24 12:22:17 -05:00