Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' into master | Gennadiy Civil | 2017-08-30 | 6 | -15/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuide | |||||
| * | | | | | | | | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuide | Herbert Thielen | 2017-08-30 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes issue #1087 | |||||
* | | | | | | | | | | | | | Merge pull request #1226 from aninf-wo/hethi/fix-typo | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typo in comment and string (SetUpTestCase) | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/fix-typo | Gennadiy Civil | 2017-08-29 | 10 | -14/+139 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105 | Gennadiy Civil | 2017-08-29 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typos mentioned in issue 1105 | |||||
| * | | | | | | | | | | | | | | use plural verb as mentioned in issue #1105 | Herbert Thielen | 2017-08-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | remove Yob's comma mentioned in issue #1105 | Herbert Thielen | 2017-08-29 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #1229 from aninf-wo/hethi/typo-xUnit | Gennadiy Civil | 2017-08-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typo: xUnit | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/typo-xUnit | Gennadiy Civil | 2017-08-29 | 2 | -8/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs | Gennadiy Civil | 2017-08-29 | 2 | -8/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce travis buildjobs by 4/12 | |||||
| * | | | | | | | | | | | | | | | run combined build only | Herbert Thielen | 2017-08-29 | 2 | -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-make | Gennadiy Civil | 2017-08-29 | 1 | -3/+3 | |
|\| | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | switch on verbose make in travis builds | |||||
| * | | | | | | | | | | | | | | switch on verbose make | Herbert Thielen | 2017-08-29 | 1 | -3/+3 | |
|/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' into hethi/typo-xUnit | Gennadiy Civil | 2017-08-29 | 6 | -3/+132 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fix typo: xUnit | Herbert Thielen | 2017-08-29 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | fix typo in comment and string (SetUpTestCase) | Herbert Thielen | 2017-08-29 | 1 | -2/+2 | |
| |/ / / / / / / / / / / | ||||||
| | * / / / / / / / / / | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA | Scott Graham | 2017-08-29 | 2 | -2/+6 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1189 from alyssawilk/flag-default | Gennadiy Civil | 2017-08-29 | 6 | -3/+132 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Adding a flag option to change the default mock type | |||||
| * | | | | | | | | | | Applying lint checks from upstream google3 | Alyssa Wilk | 2017-08-28 | 1 | -4/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'refs/heads/master' into flag-default | Alyssa Wilk | 2017-08-28 | 115 | -28062/+2959 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Handling invalid flag values | Alyssa Wilk | 2017-08-16 | 2 | -1/+28 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Adding a flag option to change the default mock type | Alyssa Wilk | 2017-08-10 | 6 | -3/+102 | |
| | | | | | | | | | | | ||||||
| | | | | | | | | * | | Merge branch 'master' into master | Che-Hsun Liu | 2017-08-14 | 85 | -26835/+586 | |
| | | | | | | | | |\ \ | | | | | | | | | |/ / | | | | | | | | |/| | | ||||||
| | | | | | | | | * | | Update googletest README.md | Che-Hsun Liu | 2017-07-02 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `EXCLUDE_FROM_ALL` in `add_subdirectory` to prevent `make install` from including lots of headers from gtest/gmock. ``` add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src ${CMAKE_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL) ``` | |||||
| | | | | | | | | | * | Speed up printing of characters which need hex escaping | Brian Silverman | 2017-08-28 | 1 | -1/+4 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change speeds up the runtime of a value-parameterized test I have which has lots of values with large strings full of unprintable characters by 2x. I profiled it and traced most of the slowness during googletest startup down to the way String::FormatHexInt was creating and destroyed a stringstream for each character in the string for each value. | |||||
* | | | | | | | | | | Merge pull request #1222 from KindDragon/vs-projects-fix3 | Gennadiy Civil | 2017-08-25 | 4 | -7/+216 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Support x64 configuration for old VS2015 projects | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into vs-projects-fix3 | Gennadiy Civil | 2017-08-24 | 10 | -1222/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1221 from KindDragon/vs-projects-fix2 | Gennadiy Civil | 2017-08-24 | 10 | -1222/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove gtest VS2005 projects | |||||
| * | | | | | | | | | | | Remove gtest VS2005 projects | Arkady Shapkin | 2017-08-25 | 10 | -1222/+0 | |
|/ / / / / / / / / / / | ||||||
| * / / / / / / / / / | Support x64 configuration for old VS2015 projects | Arkady Shapkin | 2017-08-25 | 4 | -7/+216 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1186 from Dani-Hub/master | Gennadiy Civil | 2017-08-24 | 4 | -8/+74 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Prevent infinite loops for recursive containers like boost::filesystem::path | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into master | Gennadiy Civil | 2017-08-23 | 23 | -22/+1879 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1219 from KindDragon/vs-projects-fix | Gennadiy Civil | 2017-08-23 | 23 | -22/+1879 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Support x64 configuration for VS2010 projects | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into vs-projects-fix | Gennadiy Civil | 2017-08-22 | 2 | -8/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Support x64 configuration for old VS2010 projects | Arkady Shapkin | 2017-08-23 | 23 | -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 master | Daniel Krügler | 2017-08-23 | 2 | -8/+47 | |
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1220 from romkatv/property-matcher | Gennadiy Civil | 2017-08-22 | 2 | -8/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Support ref-qualified member functions in Property(). | |||||
| * | | | | | | | | | | Support ref-qualified member functions in Property(). | Roman Perepelitsa | 2017-08-22 | 2 | -8/+47 | |
|/ / / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 93 | -26841/+845 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 94 | -26841/+847 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge branch 'master' into master | Daniel Krügler | 2017-08-21 | 93 | -26841/+845 | |
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1206 from ShadowIce/methodname-in-exception | Gennadiy Civil | 2017-08-21 | 2 | -1/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add function name to exception if there's no default action | |||||
| * | | | | | | | | | | | Remove unused variable | Maurice Gilden | 2017-08-21 | 1 | -1/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Added "explicit" as per compiler suggestion | Gennadiy Civil | 2017-08-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Proposing these changes, please review | Gennadiy Civil | 2017-08-20 | 1 | -12/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slightly better names and cleaner tests. Please review | |||||
| * | | | | | | | | | | | Merge branch 'master' into methodname-in-exception | Gennadiy Civil | 2017-08-18 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #1215 from henryiii/patch-1 | Gennadiy Civil | 2017-08-18 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding CMake visibility policy setting | |||||
| * | | | | | | | | | | | | Adding CMake visibility policy setting | Henry Schreiner | 2017-08-18 | 1 | -0/+4 | |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This policy setting will silence a warning when using with a visibility settings on targets. Due to the forced `cmake_minimum_version`, policy settings in CMakeLists calling this one (including the main CMakeLists) are lost, forcing the change to be made here. |