aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1917-115/+7
|\
| * Merge pull request #1248 from ↵Gennadiy Civil2017-12-1916-112/+4
| |\ | | | | | | | | | | | | aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS remove GTEST_HAS_PARAM_TESTS
| | * Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-3/+0
| | |
| | * Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-0/+3
| | |
| | * Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-1817-389/+502
| | |\
| | * \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-096-6/+18
| | |\ \
| | * \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-011-3/+3
| | |\ \ \
| | * \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-0714-47/+136
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-0420-22/+22
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-2410-163/+193
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-086-11/+42
| | |\ \ \ \ \ \ \
| | * | | | | | | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-0416-112/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in issue #360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." https://github.com/google/googletest/issues/360
| * | | | | | | | | Merge pull request #1212 from qzmfranklin/bazelGennadiy Civil2017-12-191-3/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | Also build when included in source.
| | * | | | | | | | Merge branch 'master' into bazelGennadiy Civil2017-12-18108-1981/+3326
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into bazelGennadiy Civil2017-08-224-9/+71
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into bazelZhongming Qu2017-08-181-0/+4
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Also can build when included in source.Zhongming Qu2017-08-181-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Remove trailing whitespaces in BUILD.bazelZhongming Qu2017-08-181-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1520-393/+508
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1354 from coryan/fix-top-level-licenseGennadiy Civil2017-12-159-360/+193
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add top-level LICENSE and CONTRIBUTING.md files [skip ci]
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-top-level-license' of github.com:coryan/googletest into ↵Carlos O'Ryan2017-12-1110-33/+313
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-top-level-license
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-top-level-licenseGennadiy Civil2017-12-1110-33/+313
| | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1355 from coryan/blaze-build-travisGennadiy Civil2017-12-118-29/+309
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | Implement bazel-based builds in Travis.
| | * | | | | | | | | | | | Merge branch 'master' into blaze-build-travisGennadiy Civil2017-12-112-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1333 from sam-lunt/use-system-includesGennadiy Civil2017-12-092-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use system includes
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into use-system-includesGennadiy Civil2017-12-086-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-011-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | make includes systemSam Lunt2017-11-272-4/+4
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | Implement bazel-based builds in Travis.Carlos O'Ryan2017-12-088-29/+309
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactored test build scripts to enable bazel-build scripts in Travis.
| | | | * | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-118-364/+132
| | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the review comments.
| | | | * | | | | | | | Also add documentation around becoming a contributor.Carlos O'Ryan2017-12-081-0/+37
| | | | | | | | | | | |
| | | | * | | | | | | | Wrong LICENSE file, sorry. Corrected. [skip ci]Carlos O'Ryan2017-12-081-201/+28
| | | | | | | | | | | |
| | | | * | | | | | | | Add Apache-2.0 LICENSE file.Carlos O'Ryan2017-12-081-0/+201
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #1340 from coryan/fix-googlemock-test-build-fileGennadiy Civil2017-12-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add licenses() directive for googlemock/tests.
| | * | | | | | | | | | Add licenses() directive for googlemock/tests.Carlos O'Ryan2017-12-081-0/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the directive embedding googletest into third_party breaks any //... target.
* | | | | | | | | | | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-085-2/+12
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #1345 from coryan/fix-travis-build-macOSGennadiy Civil2017-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Travis build
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-travis-build-macOSGennadiy Civil2017-12-083-0/+7
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1348 from wmamrak/masterGennadiy Civil2017-12-083-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Remove C4996 warning in VS2017
| | * | | | | | | | | | | Remove C4996 warning in VS2017Wojciech Mamrak2017-12-071-0/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| |/ / / / / / / / / / /
| | * / / / / / / / / / Only switch to g++-4.9 on Linux.Carlos O'Ryan2017-12-061-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #1225 from brian-peloton/masterGennadiy Civil2017-12-051-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Speed up printing of characters which need hex escaping
| | * | | | | | | | | Merge branch 'master' into masterGennadiy Civil2017-12-0157-334/+644
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Speed up printing of characters which need hex escapingBrian Silverman2017-08-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change speeds up the runtime of a value-parameterized test I have which has lots of values with large strings full of unprintable characters by 2x. I profiled it and traced most of the slowness during googletest startup down to the way String::FormatHexInt was creating and destroyed a stringstream for each character in the string for each value.
* | | | | | | | | | | Run autoconf from top-level directory.Carlos O'Ryan2017-12-035-31/+106
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part (hopefully all) of the fixes for #776. The top-level configure.ac configures googletest first and then googlemock. With this changes it is possible to embed googletest into another project that uses autoconf. For an example (though it is WIP), see the commits (and soon PR) referenced from google/protobuf#236.
* | | | | | | | | | Merge pull request #1324 from whame/masterGennadiy Civil2017-12-011-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Fix issue #826 by treating MinGW as "non-Windows" when determining colored output
| * | | | | | | | | Fixes issue #826 by treating MinGW as "non-Windows" when determining colored ↵whame2017-11-071-3/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | output
* | | | | | | | | Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312Gennadiy Civil2017-10-301-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove markdown stars (bold) from code examples
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 12:21:07 +0000