Commit Graph

1390 Commits

Author SHA1 Message Date
bryanzim
773cc78765
Merge branch 'master' into master 2017-12-20 08:21: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
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
bryanzim
d6a4478caf
Merge branch 'master' into master 2017-12-08 13:11:34 -05:00
Gennadiy Civil
cc372a071b
Merge pull request #1340 from coryan/fix-googlemock-test-build-file
Add licenses() directive for googlemock/tests.
2017-12-08 13:03:20 -05:00
Carlos O'Ryan
cf3adad594
Add licenses() directive for googlemock/tests.
Without the directive embedding googletest into third_party breaks
any //... target.
2017-12-08 12:08:25 -05:00
bryanzim
4aae1600d0
Merge branch 'master' into master 2017-12-08 11:31:31 -05:00
Gennadiy Civil
4d1f930af8
Merge pull request #1345 from coryan/fix-travis-build-macOS
Fix Travis build
2017-12-08 11:09:01 -05:00
Gennadiy Civil
efc6abae67
Merge branch 'master' into fix-travis-build-macOS 2017-12-08 11:08:54 -05:00
Gennadiy Civil
887a6c6420
Merge pull request #1348 from wmamrak/master
Remove C4996 warning in VS2017
2017-12-08 11:08:17 -05:00
Wojciech Mamrak
57bb0bbbf8
Remove C4996 warning in VS2017 2017-12-07 18:20:25 +01:00
Wojciech Mamrak
3464f76e89
Improved description of VS std::tuple support 2017-12-07 18:18:17 +01:00
Wojciech Mamrak
8d9d6bb0a3
Improved description of VS std::tuple support 2017-12-07 18:17:43 +01:00
Carlos O'Ryan
4aa05bd4ff
Only switch to g++-4.9 on Linux. 2017-12-06 22:43:39 -05:00
bryanzim
11d21b7c2a
Merge branch 'master' into master 2017-12-06 11:09:00 -05:00
Gennadiy Civil
a868e618c0
Merge pull request #1225 from brian-peloton/master
Speed up printing of characters which need hex escaping
2017-12-05 17:19:23 -05:00
Gennadiy Civil
9e236748fb
Merge branch 'master' into master 2017-12-01 16:41:53 -05:00
Gennadiy Civil
c5cba7d17a
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-12-01 16:31:29 -05:00
Gennadiy Civil
ce919c3ddf
Merge branch 'master' into use-system-includes 2017-12-01 16:29:28 -05:00
Gennadiy Civil
247a3d8e5e
Merge pull request #1324 from whame/master
Fix issue #826 by treating MinGW as "non-Windows" when determining colored output
2017-12-01 16:27:33 -05:00
Sam Lunt
f46bd00e36 make includes system 2017-11-27 17:31:07 -06:00
Bryan Zimmerman
a7269e24ac replaced back accidently removed static_cast with consistent ImplicitCast_ 2017-11-22 09:41:32 -05:00
Gennadiy Civil
49eb76df47
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 2017-11-07 10:32:23 -08:00
whame
82447f23be Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output 2017-11-07 15:22:50 +01:00
bryanzim
530885cbd5
Merge branch 'master' into master 2017-10-30 16:58:25 -04:00
Gennadiy Civil
d175c8bf82
Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312
remove markdown stars (bold) from code examples
2017-10-30 11:18:33 -04:00
Gennadiy Civil
43d6ad75bc
Merge pull request #1308 from KindDragon/vs2017-ci
Enable CI for VS2017
2017-10-30 11:11:38 -04:00
Herbert Thielen
8866af0386 remove markdown stars (bold) from code examples 2017-10-29 17:12:00 +01:00