aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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 branch 'master' into masterbryanzim2017-12-118-29/+309
| | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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.
| | | | | | | | | | | * | | remove extra lineBryan Zimmerman2017-12-111-1/+0
| | | | | | | | | | | | | |
| | | | | | | | | | | * | | remove implicit castsBryan Zimmerman2017-12-114-10/+8
| | | | | | | | | | | | | |
| | | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-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
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-12-081-0/+2
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | 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 masterbryanzim2017-12-084-5/+7
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | 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 branch 'master' into masterbryanzim2017-12-062-4/+7
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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
| * | | | | | | | | | 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.
| | | | | | | | | * | replaced back accidently removed static_cast with consistent ImplicitCast_Bryan Zimmerman2017-11-221-1/+1
| | | | | | | | | | |
| | | | | | | | | * | Merge branch 'master' into masterbryanzim2017-10-302-4/+12
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | 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
|/ / / / / / / / / / /
| | | | | | | | | * / fix for VS2017 deprecation of ::tr1::tupleBryan Zimmerman2017-10-276-22/+31
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces
* | | | | | | | | | 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
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 17:22:21 +0000