Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master | Gennadiy Civil | 2017-10-20 | 47 | -269/+369 |
|\ | |||||
| * | Merge pull request #1300 from gennadiycivil/master | Gennadiy Civil | 2017-10-18 | 1 | -1/+1 |
| |\ | | | | | | | Workaround for Travis issue https://goo.gl/d5eV8o | ||||
| | * | Merge branch 'master' into master | Gennadiy Civil | 2017-10-18 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1298 from google/revert-1297-master | Gennadiy Civil | 2017-10-18 | 1 | -2/+0 |
| |\ \ | | | | | | | | | Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…" | ||||
| | * | | Revert "Workaround for Travis issue ↵ | Gennadiy Civil | 2017-10-18 | 1 | -2/+0 |
| |/ / | | | | | | | | | | https://github.com/travis-ci/travis-ci/is…" | ||||
| * | | Merge pull request #1297 from gennadiycivil/master | Gennadiy Civil | 2017-10-18 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Workaround for Travis issue https://github.com/travis-ci/travis-ci/is… | ||||
| | | * | Workaround for Travis issue https://goo.gl/d5eV8o | Gennadiy Civil | 2017-10-18 | 1 | -3/+1 |
| | |/ | |||||
| | * | Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552 | Gennadiy Civil | 2017-10-18 | 1 | -0/+2 |
| |/ | |||||
| * | Merge pull request #1288 from joealam/master | Gennadiy Civil | 2017-10-15 | 1 | -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 Alam | 2017-10-07 | 1 | -0/+11 |
| | | | | | | | | | | | | issues in Windows | ||||
| * | | Merge pull request #1292 from DariuszOstolski/master | Gennadiy Civil | 2017-10-15 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | #1282: Doc typo fix | ||||
| | * | #1282: Doc typo fix | Dariusz Ostolski | 2017-10-14 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #1275 from jwakely/pr/1273 | Gennadiy Civil | 2017-10-03 | 20 | -22/+22 |
| |\ | | | | | | | Use gender-neutral pronouns in comments and docs | ||||
| | * | Use gender-neutral pronouns in comments and docs | Jonathan Wakely | 2017-09-27 | 20 | -22/+22 |
| |/ | |||||
| * | Merge pull request #1249 from stkhapugin/master | Gennadiy Civil | 2017-09-23 | 1 | -1/+2 |
| |\ | | | | | | | Make TypeWithoutFormatter compatible with Objective-C++ with ARC. | ||||
| | * | Merge branch 'master' into master | Gennadiy Civil | 2017-09-23 | 9 | -162/+191 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized | Gennadiy Civil | 2017-09-21 | 3 | -43/+9 |
| |\ \ | | | | | | | | | Revert "Allow macros inside of parametrized test names." | ||||
| | * | | Revert "Allow macros inside of parametrized test names." | Gennadiy Civil | 2017-09-21 | 3 | -43/+9 |
| |/ / | |||||
| * | | Merge pull request #1245 from sheepmaster/2017_09_04_parametrized | Gennadiy Civil | 2017-09-21 | 3 | -9/+43 |
| |\ \ | | | | | | | | | Allow macros inside of parametrized test names. | ||||
| | * \ | Merge branch 'master' into 2017_09_04_parametrized | Bernhard Bauer | 2017-09-06 | 2 | -3/+8 |
| | |\ \ | |||||
| | * | | | Add a non-parametrized test. | Bernhard Bauer | 2017-09-04 | 1 | -0/+12 |
| | | | | | |||||
| | * | | | Allow macros inside of parametrized test names. | Bernhard Bauer | 2017-09-04 | 3 | -9/+31 |
| | | | | | | | | | | | | | | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling. | ||||
| * | | | | Merge pull request #1265 from bkircher/redundant-decl | Gennadiy Civil | 2017-09-20 | 1 | -4/+0 |
| |\ \ \ \ | | | | | | | | | | | | | Remove redundant declaration | ||||
| | * | | | | Remove redundant declaration | Benjamin Kircher | 2017-09-16 | 1 | -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-1 | Gennadiy Civil | 2017-09-14 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Add explicit `CMAKE_DEBUG_POSTFIX` option | ||||
| | * \ \ \ | Merge branch 'master' into patch-1 | ly2048 | 2017-09-15 | 1 | -8/+16 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #1255 from yursha/patch-1 | Gennadiy Civil | 2017-09-14 | 1 | -8/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix ellipsis position in examples | ||||
| | * \ \ \ \ | Merge branch 'master' into patch-1 | Alex Yursha | 2017-09-13 | 4 | -118/+152 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge branch 'master' into patch-1 | Alex Yursha | 2017-09-12 | 3 | -30/+19 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fix ellipsis position in examples | Alex Yursha | 2017-09-08 | 1 | -8/+16 |
| | | | | | | | | |||||
| | | | * | | | | Add explicit `CMAKE_DEBUG_POSTFIX` option | ly2048 | 2017-09-14 | 1 | -0/+2 |
| | |_|/ / / / | |/| | | | | | | | | | | | | Enable generating different library name to be compatible with CMake's `FindGTest`. | ||||
| * | | | | | | Merge pull request #1242 from DarthGandalf/expect | Gennadiy Civil | 2017-09-13 | 4 | -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 Sokolov | 2017-09-13 | 4 | -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-import | Gennadiy Civil | 2017-09-12 | 1 | -1/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | remove unused TestCase import | ||||
| | * \ \ \ \ | Merge branch 'master' into hethi/unused-import | Gennadiy Civil | 2017-09-11 | 2 | -28/+21 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into hethi/unused-import | Herbert Thielen | 2017-09-08 | 6 | -11/+42 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into hethi/unused-import | Herbert Thielen | 2017-09-05 | 22 | -75/+103 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | * | | | | | | | Merge branch 'master' into hethi/unused-import | Herbert Thielen | 2017-08-31 | 4 | -3/+10 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into hethi/unused-import | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/unused-import | Herbert Thielen | 2017-08-30 | 11 | -16/+141 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | remove unused TestCase import | Herbert Thielen | 2017-08-29 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1250 from ↵ | Gennadiy Civil | 2017-09-11 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aninf-wo/hethi/remove-linker-warning-on-non-existing-path remove obsolete link_directories command | ||||
| | * | | | | | | | | | | Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path | Herbert Thielen | 2017-09-08 | 6 | -11/+42 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | remove obsolete link_directories command | Herbert Thielen | 2017-09-05 | 1 | -3/+0 |
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not necessary, as the target_link_libraries command contains an absolute path already, and the path given doesn't exist anymore, leading only to linker warnings like: ld: warning: directory not found for option '-L/Users/travis/build/google/googletest/build/googlemock/gtest/src' | ||||
| * | | | | | | | | | | Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printf | Gennadiy Civil | 2017-09-11 | 1 | -26/+19 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | User logger GTEST_LOG instead of printf in gtest.cc to log errors | ||||
| | * | | | | | | | | | Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into ↵ | Gasprd Petit | 2017-09-07 | 9 | -26/+70 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_logger_instead_of_printf | ||||
| | * | | | | | | | | | | Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is ↵ | Gasprd Petit | 2017-09-07 | 1 | -16/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected to abort() | ||||
| | * | | | | | | | | | | Merge branch 'master' into user_logger_instead_of_printf | Gennadiy Civil | 2017-09-01 | 81 | -1348/+2699 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Removed extra colon in error log | gpetit | 2017-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf | gpetit | 2017-08-14 | 111 | -27398/+1254 |
| | |\ \ \ \ \ \ \ \ \ \ \ |