aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | remove markdown stars (bold) from code examplesHerbert Thielen2017-10-291-4/+4
| | |
* | | Merge pull request #1308 from KindDragon/vs2017-ciGennadiy Civil2017-10-301-0/+8
|\ \ \ | |/ / |/| | Enable CI for VS2017
| * | Enable CI for VS2017Arkady Shapkin2017-10-261-0/+8
|/ /
* | Merge pull request #1304 from m-gupta/gtestapifixGennadiy Civil2017-10-251-2/+2
|\ \ | | | | | | googletest: Add GTEST_API_ attribute to ThreadLocal class.
| * \ Merge branch 'master' into gtestapifixm-gupta2017-10-258-26/+83
| |\ \
| * | | googletest: Add GTEST_API_ attribute to ThreadLocal class.Manoj Gupta2017-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ThreadLocal class needs to be have default visibility. Root cause is gtest uses typeinfo for the ThreadLocal class. The problem manifests When gtest/gmock are built as a shared library with libc++. When a class is used in typeinfo, it must have default visibility. There is an explanation about typeinfo and visibility here: https://developer.apple.com/library/content/documentation/DeveloperTools/Conceptual/CppRuntimeEnv/Articles/SymbolVisibility.html When libc++ is used with gtest in shared library mode, any tests that are compiled with -fvisibility=hidden and exercise the macro EXPECT_CALL, it results in an abort like: [ FATAL ] /usr/include/gtest/internal/gtest-port.h:1394:: Condition typeid(*base) == typeid(Derived) failed. This is because the typeinfo for ThreadLocal class is not visible. Therefore, linker failed to match it to the shared library symbol, creating a new symbol instead. This fixes https://github.com/google/googletest/issues/1207.
* | | | Merge pull request #913 from ↵Gennadiy Civil2017-10-252-13/+26
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Romain-Geissler/fix-gcc-misleading-indentation-warning Remove gcc 6 misleading indentations warnings
| * | | Remove gcc 6 misleading indentations.Romain Geissler2017-10-252-13/+26
|/ / /
* | | Merge pull request #1218 from KindDragon/vs-build-fixGennadiy Civil2017-10-257-25/+81
|\ \ \ | | | | | | | | VS2015/2017 build fix and enable C++11 features (attempt number three)
| * | | Fix gmock tests when std::unary_function unavailableArkady Shapkin2017-10-251-2/+5
| | | |
| * | | Fix tests with VS2015 and VS2017Arkadiy Shapkin2017-10-256-20/+68
| | | |
| * | | Enable C++11 features for VS2015 and VS2017Arkadiy Shapkin2017-10-251-3/+8
|/ / /
* | | Merge pull request #1139 from chehsunliu/masterGennadiy Civil2017-10-241-1/+2
|\ \ \ | |/ / |/| | Update the CMakeLists.txt section in googletest README.md.
| * | Merge branch 'master' into masterGennadiy Civil2017-10-2047-269/+369
| |\ \ | |/ / |/| |
* | | Merge pull request #1300 from gennadiycivil/masterGennadiy Civil2017-10-181-1/+1
|\ \ \ | | | | | | | | Workaround for Travis issue https://goo.gl/d5eV8o
| * \ \ Merge branch 'master' into masterGennadiy Civil2017-10-180-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1298 from google/revert-1297-masterGennadiy Civil2017-10-181-2/+0
|\ \ \ \ | | | | | | | | | | Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…"
| * | | | Revert "Workaround for Travis issue ↵Gennadiy Civil2017-10-181-2/+0
|/ / / / | | | | | | | | | | | | https://github.com/travis-ci/travis-ci/is…"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 22:50:01 +0000