gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,418 Commits 1 Branch 0 Tags
67d6e467285d7765d3df60093d23ba3b86838470
Commit Graph

1418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos O'Ryan
67d6e46728 Use correct name for build event types. 2018-01-05 14:58:48 -05:00
Carlos O'Ryan
adfdc65ca7 Fixed test for pull request. 2018-01-05 11:01:37 -05:00
Carlos O'Ryan
d3acb4ba18 Fixed output and test for 'enabled_on_pr' 2018-01-05 09:32:50 -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
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
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
Gennadiy Civil
e76c3f837c Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-22 14:47:25 -05:00
Gennadiy Civil
5490beb060 Merge pull request #778 from gpakosz/C4389 
Re-enable MSVC++ C4389 warning in CmdHelperEq()
 2017-12-21 21:10:03 -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
Gennadiy Civil
0062e4869f Merge pull request #1357 from bryanzim/master 
CMake fixes for paths with spaces
 2017-12-20 15:57:28 -05:00
bryanzim
e17907da80 Update internal_utils.cmake 2017-12-20 10:06:20 -05:00
bryanzim
773cc78765 Merge branch 'master' into master 2017-12-20 08:21:22 -05:00
Gennadiy Civil
b5b6a07d14 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-19 13:43:22 -05:00
Gennadiy Civil
a37eedc3c1 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
782384d11f Merge pull request #1212 from qzmfranklin/bazel 
Also build when included in source.
 2017-12-19 12:02:33 -05:00
Gennadiy Civil
a7fceb4a98 Update gtest-param-test.h.pump 2017-12-19 10:58:37 -05:00
Gennadiy Civil
8a48f0ed4e Update gtest-param-test.h.pump 2017-12-19 10:55:49 -05:00
Gennadiy Civil
058b318bc7 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-12-18 12:02:12 -05:00
Gennadiy Civil
a7bd3725f0 Merge branch 'master' into bazel 2017-12-18 11:38:08 -05:00
bryanzim
8cbda54f48 Merge branch 'master' into master 2017-12-15 16:52:50 -05:00
Gennadiy Civil
f6c44fe318 Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 2017-12-15 15:49:46 -05:00
Gennadiy Civil
1865ecaf17 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
f34cbefe50 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
23a014ab57 Refactor docs about contributions to CONTRIBUTING.md. 
Per the review comments.
 2017-12-11 19:33:27 -05:00
bryanzim
4c8e288fcf Merge branch 'master' into master 2017-12-11 14:11:28 -05:00
Gennadiy Civil
cb95f316c8 Merge branch 'master' into fix-top-level-license 2017-12-11 13:13:07 -05:00
Gennadiy Civil
0fe96607d8 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
74a5306313 remove extra line 2017-12-11 12:21:35 -05:00
Bryan Zimmerman
3ea06317cd remove implicit casts 2017-12-11 12:19:56 -05:00
Gennadiy Civil
ed811dc79f Merge branch 'master' into blaze-build-travis 2017-12-11 10:48:12 -05:00
bryanzim
f98c20baa8 Merge branch 'master' into master 2017-12-11 09:37:55 -05:00
Gennadiy Civil
55fca1937d Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-12-09 09:41:02 -05:00
Gennadiy Civil
59202300f1 Merge pull request #1333 from sam-lunt/use-system-includes 
Use system includes
 2017-12-09 09:38:16 -05:00
Carlos O'Ryan
c82cd5e41e Also add documentation around becoming a contributor. 2017-12-08 23:20:55 -05:00
Carlos O'Ryan
11841175d8 Wrong LICENSE file, sorry. Corrected. [skip ci] 2017-12-08 23:16:46 -05:00
Carlos O'Ryan
bc3320b7f1 Implement bazel-based builds in Travis. 
This refactored test build scripts to enable
bazel-build scripts in Travis.
 2017-12-08 20:59:07 -05:00
Carlos O'Ryan
e22d344c51 Add Apache-2.0 LICENSE file. 2017-12-08 17:24:23 -05:00
Gennadiy Civil
10ef1d9a1e Merge branch 'master' into use-system-includes 2017-12-08 15:11:13 -05:00