Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-18 | 17 | -389/+502 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | * | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-09 | 6 | -6/+18 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-01 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||||
| | * | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-11-07 | 14 | -47/+136 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-10-04 | 20 | -22/+22 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-24 | 10 | -163/+193 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-08 | 6 | -11/+42 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | remove GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-04 | 16 | -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/bazel | Gennadiy Civil | 2017-12-19 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | Also build when included in source. | |||||
| | * | | | | | | | | | | | Merge branch 'master' into bazel | Gennadiy Civil | 2017-12-18 | 108 | -1981/+3326 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'master' into bazel | Gennadiy Civil | 2017-08-22 | 4 | -9/+71 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bazel | Zhongming Qu | 2017-08-18 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Also can build when included in source. | Zhongming Qu | 2017-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Remove trailing whitespaces in BUILD.bazel | Zhongming Qu | 2017-08-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | * | | | Merge branch 'master' into master | bryanzim | 2017-12-15 | 9 | -360/+193 | |
| | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1354 from coryan/fix-top-level-license | Gennadiy Civil | 2017-12-15 | 9 | -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'Ryan | 2017-12-11 | 10 | -33/+313 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-top-level-license | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-top-level-license | Gennadiy Civil | 2017-12-11 | 10 | -33/+313 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md. | Carlos O'Ryan | 2017-12-11 | 8 | -364/+132 | |
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the review comments. | |||||
| | * | | | | | | | | | | | | | | Also add documentation around becoming a contributor. | Carlos O'Ryan | 2017-12-08 | 1 | -0/+37 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Wrong LICENSE file, sorry. Corrected. [skip ci] | Carlos O'Ryan | 2017-12-08 | 1 | -201/+28 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Add Apache-2.0 LICENSE file. | Carlos O'Ryan | 2017-12-08 | 1 | -0/+201 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | | | Merge branch 'master' into master | bryanzim | 2017-12-11 | 8 | -29/+309 | |
| | | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #1355 from coryan/blaze-build-travis | Gennadiy Civil | 2017-12-11 | 8 | -29/+309 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | Implement bazel-based builds in Travis. | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into blaze-build-travis | Gennadiy Civil | 2017-12-11 | 2 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Implement bazel-based builds in Travis. | Carlos O'Ryan | 2017-12-08 | 8 | -29/+309 | |
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactored test build scripts to enable bazel-build scripts in Travis. | |||||
| | | | | | | | | | | | * | | | remove extra line | Bryan Zimmerman | 2017-12-11 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | * | | | remove implicit casts | Bryan Zimmerman | 2017-12-11 | 4 | -10/+8 | |
| | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | * | | | Merge branch 'master' into master | bryanzim | 2017-12-11 | 2 | -4/+4 | |
| | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1333 from sam-lunt/use-system-includes | Gennadiy Civil | 2017-12-09 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | Use system includes | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into use-system-includes | Gennadiy Civil | 2017-12-08 | 6 | -2/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge branch 'master' into use-system-includes | Gennadiy Civil | 2017-12-01 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | make includes system | Sam Lunt | 2017-11-27 | 2 | -4/+4 | |
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | | Merge branch 'master' into master | bryanzim | 2017-12-08 | 1 | -0/+2 | |
| | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #1340 from coryan/fix-googlemock-test-build-file | Gennadiy Civil | 2017-12-08 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | Add licenses() directive for googlemock/tests. | |||||
| | * | | | | | | | | | | | | Add licenses() directive for googlemock/tests. | Carlos O'Ryan | 2017-12-08 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the directive embedding googletest into third_party breaks any //... target. | |||||
| | | | | | | | | | | * | | Merge branch 'master' into master | bryanzim | 2017-12-08 | 4 | -5/+7 | |
| | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | Merge branch 'master' into master | bryanzim | 2017-12-06 | 2 | -4/+7 | |
| | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | * | | | replaced back accidently removed static_cast with consistent ImplicitCast_ | Bryan Zimmerman | 2017-11-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | | Merge branch 'master' into master | bryanzim | 2017-10-30 | 2 | -4/+12 | |
| | | | | | | | | | | |\ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | | fix for VS2017 deprecation of ::tr1::tuple | Bryan Zimmerman | 2017-10-27 | 6 | -22/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces | |||||
* | | | | | | | | | | | | | | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2017-12-08 | 5 | -2/+12 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #1345 from coryan/fix-travis-build-macOS | Gennadiy Civil | 2017-12-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Travis build | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-travis-build-macOS | Gennadiy Civil | 2017-12-08 | 3 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1348 from wmamrak/master | Gennadiy Civil | 2017-12-08 | 3 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | Remove C4996 warning in VS2017 | |||||
| | * | | | | | | | | | | | | | Remove C4996 warning in VS2017 | Wojciech Mamrak | 2017-12-07 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Improved description of VS std::tuple support | Wojciech Mamrak | 2017-12-07 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Improved description of VS std::tuple support | Wojciech Mamrak | 2017-12-07 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / / | ||||||
| | * / / / / / / / / / / / | Only switch to g++-4.9 on Linux. | Carlos O'Ryan | 2017-12-06 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge pull request #1225 from brian-peloton/master | Gennadiy Civil | 2017-12-05 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | Speed up printing of characters which need hex escaping |