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

1582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
53c478d639), 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
David Benjamin
914dda29f4 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
e096cfaaf1 Build both googletest and googlemock. 2017-12-24 12:22:46 -05:00
Carlos O'Ryan
cbd3ad0155 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
Gennadiy Civil
bc5eddec4c Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-22 14:47:25 -05:00
Gennadiy Civil
26ea55166f Merge pull request #778 from gpakosz/C4389 
Re-enable MSVC++ C4389 warning in CmdHelperEq()
 2017-12-21 21:10:03 -05:00
Gregory Pakosz
00c2c50f88 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
Gennadiy Civil
bf3768bb20 Merge pull request #1357 from bryanzim/master 
CMake fixes for paths with spaces
 2017-12-20 15:57:28 -05:00
bryanzim
508b23f964 Update internal_utils.cmake 2017-12-20 10:06:20 -05:00
bryanzim
52e12448a8 Merge branch 'master' into master 2017-12-20 08:21:22 -05:00
Gennadiy Civil
afcf3a5265 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-19 13:43:22 -05:00
Gennadiy Civil
b4bfa326b0 Merge pull request #1248 from aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 
remove GTEST_HAS_PARAM_TESTS
 2017-12-19 13:18:57 -05:00
Gennadiy Civil
109233429c Merge pull request #1212 from qzmfranklin/bazel 
Also build when included in source.
 2017-12-19 12:02:33 -05:00
Gennadiy Civil
e9c19a9abb Update gtest-param-test.h.pump 2017-12-19 10:58:37 -05:00
Gennadiy Civil
acb41a3e4a Update gtest-param-test.h.pump 2017-12-19 10:55:49 -05:00
Gennadiy Civil
9291399ef3 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-12-18 12:02:12 -05:00
Gennadiy Civil
dfbc1773d6 Merge branch 'master' into bazel 2017-12-18 11:38:08 -05:00
bryanzim
0e0dc8cdfb Merge branch 'master' into master 2017-12-15 16:52:50 -05:00
Gennadiy Civil
4f3a212568 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-15 15:49:46 -05:00
Gennadiy Civil
3e48195784 Merge pull request #1354 from coryan/fix-top-level-license 
Add top-level LICENSE and CONTRIBUTING.md files [skip ci]
 2017-12-15 15:49:18 -05:00
Carlos O'Ryan
414af0e8a5 Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license 2017-12-11 19:34:19 -05:00
Carlos O'Ryan
3c218ff29c Refactor docs about contributions to CONTRIBUTING.md. 
Per the review comments.
 2017-12-11 19:33:27 -05:00
bryanzim
13a4a325a5 Merge branch 'master' into master 2017-12-11 14:11:28 -05:00
Gennadiy Civil
0cbe36bada Merge branch 'master' into fix-top-level-license 2017-12-11 13:13:07 -05:00
Gennadiy Civil
b0ed245299 Merge pull request #1355 from coryan/blaze-build-travis 
Implement bazel-based builds in Travis.
 2017-12-11 13:08:20 -05:00
Bryan Zimmerman
531d5ef77a remove extra line 2017-12-11 12:21:35 -05:00
Bryan Zimmerman
4136c40a6f remove implicit casts 2017-12-11 12:19:56 -05:00
Gennadiy Civil
a8e0fde335 Merge branch 'master' into blaze-build-travis 2017-12-11 10:48:12 -05:00
bryanzim
0fb3f4c80b Merge branch 'master' into master 2017-12-11 09:37:55 -05:00
Gennadiy Civil
000582a49b Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-12-09 09:41:02 -05:00