aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-314-3/+10
|\
| * Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmakeGennadiy Civil2017-08-301-1/+0
| |\ | | | | | | remove non-existing gmock_build_samples switch
| | * Merge branch 'master' into hethi/travis-unused-cmakeGennadiy Civil2017-08-301-2/+2
| | |\
| | * \ Merge branch 'master' into hethi/travis-unused-cmakeHerbert Thielen2017-08-305-13/+9
| | |\ \
| | * | | remove non-existing gmock_build_samples switchHerbert Thielen2017-08-291-1/+0
| | | | |
| * | | | Merge pull request #1237 from sgraham/update-docs-3Gennadiy Civil2017-08-303-2/+10
| |\ \ \ \ | | |_|_|/ | |/| | | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change
| | * | | Removed "Trivial" Gennadiy Civil2017-08-301-1/+1
| | | | | | | | | | | | | | | Who knows? may not be very trivial given the code drift between internal and OSS
| | * | | removed internal link ( not allowed in OSS)Gennadiy Civil2017-08-301-1/+1
| | | | |
| | * | | Note that it is preferable for Googlers to create a CL internally firstScott Graham2017-08-301-0/+4
| | | | |
| | * | | Merge branch 'master' into masterGennadiy Civil2017-08-306-15/+11
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIAScott Graham2017-08-292-2/+6
| | |/ /
* | | | Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-301-2/+2
|\| | |
| * | | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguideGennadiy Civil2017-08-301-2/+2
| |\ \ \ | | |_|/ | |/| | fix SetUp/TearDownTestCase() in AdvancedGuide
| | * | fix SetUp/TearDownTestCase() in AdvancedGuideHerbert Thielen2017-08-301-2/+2
| |/ / | | | | | | | | | fixes issue #1087
* | | create different python based tests for single and multi configuration build ↵Herbert Thielen2017-08-301-9/+21
| | | | | | | | | | | | generators
* | | Revert "ask cmake for per-configuration output subdir"Herbert Thielen2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e. Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't help here.
* | | ask cmake for per-configuration output subdirHerbert Thielen2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | On single-configuration build systems as Makefile Generators, there is no subdirectory for the configuration in the build tree - therefore ask cmake for the subdir by using CMAKE_CFG_INTDIR, which is just '.' on single-configuration build systems (Linux et al.).
* | | remove obsolete comment regarding python tests on linuxHerbert Thielen2017-08-301-2/+0
| | |
* | | use upper-case build typeHerbert Thielen2017-08-301-2/+2
| | | | | | | | | | | | | | | While cmake does not complain on build type 'debug', the cmake documentation always spells it 'Debug', so take this.
* | | use build type set in .travis.ymlHerbert Thielen2017-08-301-0/+1
|/ / | | | | | | The BUILD_TYPE variable of .travis.yml was ignored up to now.
* | Merge pull request #1226 from aninf-wo/hethi/fix-typoGennadiy Civil2017-08-301-2/+2
|\ \ | | | | | | fix typo in comment and string (SetUpTestCase)
| * \ Merge branch 'master' into hethi/fix-typoGennadiy Civil2017-08-2910-14/+139
| |\ \ | |/ / |/| |
* | | Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105Gennadiy Civil2017-08-291-2/+2
|\ \ \ | | | | | | | | fix typos mentioned in issue 1105
| * | | use plural verb as mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
| | | |
| * | | remove Yob's comma mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
| | |/ | |/|
* | | Merge pull request #1229 from aninf-wo/hethi/typo-xUnitGennadiy Civil2017-08-291-1/+1
|\ \ \ | | | | | | | | fix typo: xUnit
| * \ \ Merge branch 'master' into hethi/typo-xUnitGennadiy Civil2017-08-292-8/+4
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobsGennadiy Civil2017-08-292-8/+4
|\ \ \ \ | | | | | | | | | | reduce travis buildjobs by 4/12
| * | | | run combined build onlyHerbert Thielen2017-08-292-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | There is no need for separate 'googlemock' and 'googletest' builds, as the 'googlemock' build includes 'googletest' and it's unit tests.
* | | | | Merge pull request #1231 from aninf-wo/heth/travis-verbose-makeGennadiy Civil2017-08-291-3/+3
|\| | | | | |_|/ / |/| | | switch on verbose make in travis builds
| * | | switch on verbose makeHerbert Thielen2017-08-291-3/+3
|/ / /
| * | Merge branch 'master' into hethi/typo-xUnitGennadiy Civil2017-08-296-3/+132
| |\ \ | |/ / |/| |
* | | Merge pull request #1189 from alyssawilk/flag-defaultGennadiy Civil2017-08-296-3/+132
|\ \ \ | | | | | | | | Adding a flag option to change the default mock type
| * | | Applying lint checks from upstream google3Alyssa Wilk2017-08-281-4/+7
| | | |
| * | | Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-28115-28062/+2959
| |\ \ \ | |/ / / |/| | |
| * | | Handling invalid flag valuesAlyssa Wilk2017-08-162-1/+28
| | | |
| * | | Adding a flag option to change the default mock typeAlyssa Wilk2017-08-106-3/+102
| | | |
| | * | fix typo: xUnitHerbert Thielen2017-08-291-1/+1
| |/ / |/| |
| | * fix typo in comment and string (SetUpTestCase)Herbert Thielen2017-08-291-2/+2
| |/ |/|
* | Merge pull request #1222 from KindDragon/vs-projects-fix3Gennadiy Civil2017-08-254-7/+216
|\ \ | | | | | | Support x64 configuration for old VS2015 projects
| * \ Merge branch 'master' into vs-projects-fix3Gennadiy Civil2017-08-2410-1222/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1221 from KindDragon/vs-projects-fix2Gennadiy Civil2017-08-2410-1222/+0
|\ \ \ | | | | | | | | Remove gtest VS2005 projects
| * | | Remove gtest VS2005 projectsArkady Shapkin2017-08-2510-1222/+0
|/ / /
| * / Support x64 configuration for old VS2015 projectsArkady Shapkin2017-08-254-7/+216
|/ /
* | Merge pull request #1186 from Dani-Hub/masterGennadiy Civil2017-08-244-8/+74
|\ \ | | | | | | Prevent infinite loops for recursive containers like boost::filesystem::path
| * \ Merge branch 'master' into masterGennadiy Civil2017-08-2323-22/+1879
| |\ \ | |/ / |/| |
* | | Merge pull request #1219 from KindDragon/vs-projects-fixGennadiy Civil2017-08-2323-22/+1879
|\ \ \ | | | | | | | | Support x64 configuration for VS2010 projects
| * \ \ Merge branch 'master' into vs-projects-fixGennadiy Civil2017-08-222-8/+47
| |\ \ \ | |/ / / |/| | |
| * | | Support x64 configuration for old VS2010 projectsArkady Shapkin2017-08-2323-22/+1879
| | | | | | | | | | | | | | | | VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
| | * | Merge branch 'master' into masterDaniel Krügler2017-08-232-8/+47
| | |\ \ | |_|/ / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 03:42:01 +0000