Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Use GTEST_LOG instead of printf | gpetit | 2017-08-14 | 1 | -23/+26 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environment | Gennadiy Civil | 2017-09-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | remove unused variables from travis environment | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into hethi/cleanup-travis-environment | Herbert Thielen | 2017-09-08 | 5 | -8/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | remove unused variables from travis environment | Herbert Thielen | 2017-09-05 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | | Swap reinterpret_cast for static_cast | stkhapugin@chromium.org | 2017-09-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap reinterpret_cast for static_cast | |||||
| | | | | | | | | | | * | | | Merge branch 'master' into master | Stepan Khapugin | 2017-09-08 | 4 | -7/+5 | |
| | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #1251 from ↵ | Gennadiy Civil | 2017-09-07 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aninf-wo/hethi/drop-valgrind-installation-on-travis drop unused valgrind package from Travis build slave installation | |||||
| * | | | | | | | | | | | | | | drop unused valgrind package from installation | Herbert Thielen | 2017-09-05 | 1 | -2/+0 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and remove explicit gcc installation (will be installed with g++ automatically) | |||||
* | | | | | | | | | | | | | | Merge pull request #1243 from aninf-wo/hethi/travis-release-build | Gennadiy Civil | 2017-09-07 | 4 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | switch one Trevis build to Release mode | |||||
| * | | | | | | | | | | | | | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy function | Herbert Thielen | 2017-09-07 | 1 | -7/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' into hethi/travis-release-build | Herbert Thielen | 2017-09-07 | 4 | -4/+37 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | avoid warning about unused variable | Herbert Thielen | 2017-09-04 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | avoid -Wshadow warning on GCC | Herbert Thielen | 2017-09-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using INSTANTIATE_TEST_CASE_P with a lambda function which uses 'info' as parameter name, GCC complains that this would shadow parameter 'info' used in the macro's VA_ARGS call. | |||||
| * | | | | | | | | | | | | | treat all warnings as errors for GCC (-Werror) | Herbert Thielen | 2017-09-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | switch one build to Release mode | Herbert Thielen | 2017-09-01 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns on optimization which allows the compiler to discover more problems and omit some more warnings. | |||||
| | | | | | | | | | * | | | Merge branch 'master' into master | Stepan Khapugin | 2017-09-07 | 4 | -4/+37 | |
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #1246 from aninf-wo/hethi/enable-travis-gcc-cache | Gennadiy Civil | 2017-09-06 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable Travis ccache to speed up CI builds | |||||
| * | | | | | | | | | | | | | reset ccache statistics at install | Herbert Thielen | 2017-09-05 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | show ccache statistics in log | Herbert Thielen | 2017-09-05 | 1 | -0/+3 | |
| | | | | | | | | | | | | | |