aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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…"
* | | Merge pull request #1297 from gennadiycivil/masterGennadiy Civil2017-10-181-0/+2
|\ \ \ | | | | | | | | Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…
| | * | Workaround for Travis issue https://goo.gl/d5eV8oGennadiy Civil2017-10-181-3/+1
| |/ /
| * / Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552Gennadiy Civil2017-10-181-0/+2
|/ /
* | Merge pull request #1288 from joealam/masterGennadiy Civil2017-10-151-0/+11
|\ \ | | | | | | Updated README with C runtime dynamic/static linking issues in Windows info
| * | Updated README with information about C runtime dynamic/static linking ↵Joe Alam2017-10-071-0/+11
| | | | | | | | | | | | issues in Windows
* | | Merge pull request #1292 from DariuszOstolski/masterGennadiy Civil2017-10-151-1/+1
|\ \ \ | |/ / |/| | #1282: Doc typo fix
| * | #1282: Doc typo fixDariusz Ostolski2017-10-141-1/+1
|/ /
* | Merge pull request #1275 from jwakely/pr/1273Gennadiy Civil2017-10-0320-22/+22
|\ \ | | | | | | Use gender-neutral pronouns in comments and docs
| * | Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-2720-22/+22
|/ /
* | Merge pull request #1249 from stkhapugin/masterGennadiy Civil2017-09-231-1/+2
|\ \ | | | | | | Make TypeWithoutFormatter compatible with Objective-C++ with ARC.
| * \ Merge branch 'master' into masterGennadiy Civil2017-09-239-162/+191
| |\ \ | |/ / |/| |
* | | Merge pull request #1271 from google/revert-1245-2017_09_04_parametrizedGennadiy Civil2017-09-213-43/+9
|\ \ \ | | | | | | | | Revert "Allow macros inside of parametrized test names."
| * | | Revert "Allow macros inside of parametrized test names."Gennadiy Civil2017-09-213-43/+9
|/ / /
* | | Merge pull request #1245 from sheepmaster/2017_09_04_parametrizedGennadiy Civil2017-09-213-9/+43
|\ \ \ | | | | | | | | Allow macros inside of parametrized test names.
| * \ \ Merge branch 'master' into 2017_09_04_parametrizedBernhard Bauer2017-09-062-3/+8
| |\ \ \
| * | | | Add a non-parametrized test.Bernhard Bauer2017-09-041-0/+12
| | | | |
| * | | | Allow macros inside of parametrized test names.Bernhard Bauer2017-09-043-9/+31
| | | | | | | | | | | | | | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling.
* | | | | Merge pull request #1265 from bkircher/redundant-declGennadiy Civil2017-09-201-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove redundant declaration
| * | | | | Remove redundant declarationBenjamin Kircher2017-09-161-4/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TempDir() function is declared twice, once in `internal/gtest-port.h` and a second time in `gtest.h`. Fixes a warning with GCC when -Wredundant-decls is given.
* | | | | Merge pull request #1259 from ly2048/patch-1Gennadiy Civil2017-09-141-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add explicit `CMAKE_DEBUG_POSTFIX` option
| * \ \ \ \ Merge branch 'master' into patch-1ly20482017-09-151-8/+16
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1255 from yursha/patch-1Gennadiy Civil2017-09-141-8/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix ellipsis position in examples
| * \ \ \ \ \ Merge branch 'master' into patch-1Alex Yursha2017-09-134-118/+152
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into patch-1Alex Yursha2017-09-123-30/+19
| |\ \ \ \ \ \
| * | | | | | | Fix ellipsis position in examplesAlex Yursha2017-09-081-8/+16
| | | | | | | |
| | | * | | | | Add explicit `CMAKE_DEBUG_POSTFIX` optionly20482017-09-141-0/+2
| |_|/ / / / / |/| | | | | | | | | | | | | Enable generating different library name to be compatible with CMake's `FindGTest`.
* | | | | | | Merge pull request #1242 from DarthGandalf/expectGennadiy Civil2017-09-134-118/+152
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Make the failure messages from EXPECT_EQ and friends actually symmetric (reopen of #1101)
| * | | | | | Make the failure messages from EXPECT_EQ and friends actually symmetric,Alexey Sokolov2017-09-134-118/+152
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of reading more like reversing the former "expected" and "actual" roles of the LHS and RHS arguments. This patch is manually applied from internal version (125109873)
* | | | | | Merge pull request #1227 from aninf-wo/hethi/unused-importGennadiy Civil2017-09-121-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unused TestCase import
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 07:48:47 +0000