aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* #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
| * \ \ \ \ Merge branch 'master' into hethi/unused-importGennadiy Civil2017-09-112-28/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-086-11/+42
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-09-0522-75/+103
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-314-3/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importGennadiy Civil2017-08-301-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/unused-importHerbert Thielen2017-08-3011-16/+141
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove unused TestCase importHerbert Thielen2017-08-291-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1250 from ↵Gennadiy Civil2017-09-111-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-pathHerbert Thielen2017-09-086-11/+42
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | remove obsolete link_directories commandHerbert Thielen2017-09-051-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_printfGennadiy Civil2017-09-111-26/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | User logger GTEST_LOG instead of printf in gtest.cc to log errors
| * | | | | | | | | Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into ↵Gasprd Petit2017-09-079-26/+70
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_logger_instead_of_printf
| * | | | | | | | | | Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is ↵Gasprd Petit2017-09-071-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected to abort()
| * | | | | | | | | | Merge branch 'master' into user_logger_instead_of_printfGennadiy Civil2017-09-0181-1348/+2699
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed extra colon in error loggpetit2017-08-141-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printfgpetit2017-08-14111-27398/+1254
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use GTEST_LOG instead of printfgpetit2017-08-141-23/+26
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environmentGennadiy Civil2017-09-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | remove unused variables from travis environment
| * | | | | | | | | | | | Merge branch 'master' into hethi/cleanup-travis-environmentHerbert Thielen2017-09-085-8/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | remove unused variables from travis environmentHerbert Thielen2017-09-051-2/+2
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | | | | | | | | | | * Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap reinterpret_cast for static_cast
| | | | | | | | | | | * Merge branch 'master' into masterStepan Khapugin2017-09-084-7/+5
| | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1251 from ↵Gennadiy Civil2017-09-071-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aninf-wo/hethi/drop-valgrind-installation-on-travis drop unused valgrind package from Travis build slave installation
| * | | | | | | | | | | | drop unused valgrind package from installationHerbert Thielen2017-09-051-2/+0
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and remove explicit gcc installation (will be installed with g++ automatically)
* | | | | | | | | | | | Merge pull request #1243 from aninf-wo/hethi/travis-release-buildGennadiy Civil2017-09-074-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | switch one Trevis build to Release mode
| * | | | | | | | | | | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy functionHerbert Thielen2017-09-071-7/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into hethi/travis-release-buildHerbert Thielen2017-09-074-4/+37
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-23 23:08:07 +0000