aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1911 from BrukerJWD:isniceGennadiy Civil2018-10-234-1/+51
|\ | | | | | | PiperOrigin-RevId: 218384341
| * Removed last reference to internal::kDefaultJonathan Wendeborn2018-10-161-1/+0
| |
| * Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isniceJonathan Wendeborn2018-10-1699-19889/+7758
| |\
| | * Merge branch 'master' into isniceBrukerJWD2018-10-1699-19889/+7758
| | |\
| * | | Use existing Mock::GetReactionOnUninterestingCalls()Jonathan Wendeborn2018-10-161-17/+3
| |/ /
| * | Don't fully qualify enum memberJonathan Wendeborn2018-10-162-8/+5
| | |
| * | Added Mock::IsNaggy, IsNice, and IsStrictJonathan Wendeborn2018-10-163-0/+69
| | |
* | | ACTION table formatSergio Valverde2018-10-231-0/+1
| | |
* | | Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fixGennadiy Civil2018-10-222-4/+6
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 217923705
| * \ \ Merge branch 'master' into relocatable-pkgconfig-fixGennadiy Civil2018-10-171-5/+6
| |\ \ \ | | | |/ | | |/|
| * | | Use pcfiledir for prefix in pkgconfig fileFilipp Andjelo2018-10-112-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using absolute paths in the pkg-config file makes it not relocatable and leads to problems, when trying to use it with precompiled cross toolchains. Setting prefix to relative path based on pcfiledir makes it more reliable for such cases.
* | | | Googletest exportAbseil Team2018-10-189-413/+341
| |/ / |/| | | | | | | | | | | | | | C++11 code cleanup. PiperOrigin-RevId: 217364243
* | | Merge pull request #1908 from rwoldberg:masterGennadiy Civil2018-10-121-5/+6
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 216909845
| * | | Change types to remove cast warnings.Robert Woldberg2018-10-121-3/+3
|/ / /
* | | Project import generated by Copybara.Abseil Team2018-10-112-0/+347
| | | | | | | | | | | | PiperOrigin-RevId: 216423319
* | | Internal Changemisterg2018-10-112-347/+0
|/ / | | | | | | PiperOrigin-RevId: 216417182
* | Remove non-variadic pre C++11 AnyOfmisterg2018-10-094-277/+16
| | | | | | | | PiperOrigin-RevId: 216411381
* | Unconditionally use std::tuple.Abseil Team2018-10-0920-1373/+1297
| | | | | | | | | | | | Remove all mention of TR1 tuple and our own implementation of tuple. PiperOrigin-RevId: 216395043
* | Remove testing::internal::BothOfMatcher, no longer neededmisterg2018-10-091-26/+0
| | | | | | | | PiperOrigin-RevId: 216389313
* | Delete CHANGESGennadiy Civil2018-10-091-126/+0
| | | | | | We are not maintaining change log, it has not been touched for a long time
* | Fixing AllOfMatches test, where it properly belongsmisterg2018-10-081-8/+8
| | | | | | | | PiperOrigin-RevId: 216193701
* | Remove non-variadic pre C++11 AllOfmisterg2018-10-084-286/+38
| | | | | | | | PiperOrigin-RevId: 216183352
* | Apply clang-tidy modernize-use-nullptr to googletest.Abseil Team2018-10-0515-301/+216
| | | | | | | | | | | | | | | | | | | | | | Now that googletest has moved to C++11, it should no longer use NULL or 0 for the null pointer. This patch converts all such usages to nullptr using clang-tidy. This prevents LLVM from issuing -Wzero-as-null-pointer-constant warnings. PiperOrigin-RevId: 215814400
* | Merge c798e39a4f96f5a985126cc3fab4738b6412cfc1 into ↵Matthieu2018-10-021-0/+14
| | | | | | | | | | | | | | | | e93da23920e5b6887d6a6a291c3a59f83f5b579e Closes #1836 PiperOrigin-RevId: 215461025
* | Merge 86fe8a25eb5a6e4546f9e39cf23a5c764217bf85 into ↵Marco Bubke2018-10-023-26/+45
| | | | | | | | | | | | | | | | 440527a61e1c91188195f7de212c63c77e8f0a45 Closes #1867 PiperOrigin-RevId: 215392714
* | Googletest exportmisterg2018-09-253-532/+17
| | | | | | | | | | | | Remove non-variadic pre C++11 ElementsAreMatcher and UnorderedElementsAreMatcher PiperOrigin-RevId: 214266944
* | [msys] pass big object file option to assembler for target gmock-matchers_testMatthieu Longo2018-09-181-0/+3
| |
* | Merge pull request #1837 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-142-23/+30
|\ \ | | | | | | Googletest export
| * | Googletest exportAbseil Team2018-09-142-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Treat default-constructed string_view same as constructed from "". In the context of string comparison (e.g. HasSubstr, StartsWith, EndsWith, etc.), a default-constructed string_view (nullptr) should be semantically same as a empty string "". PiperOrigin-RevId: 212816839
* | | Update README.mdGennadiy Civil2018-09-131-29/+0
|/ /
* | Fix gcc misleading indentation again.Romain Geissler2018-09-102-12/+24
| |
* | Fix doc linksArkady Shapkin2018-09-046-23/+22
| |
* | Merge branch 'master' into fix-gmock-pkgconfigGennadiy Civil2018-09-045-316/+342
|\ \
| * | Update documentation to syntax highlight codeArkady Shapkin2018-09-035-316/+342
| | |
* | | pkgconfig: Unconditionally depend on GTest when using GMockDavid Seifert2018-09-022-0/+2
|/ / | | | | | | | | * GTest is a required dependency for GMock, hence we always need to pull it in.
* | Googletest exportmisterg2018-08-301-3/+5
| | | | | | | | | | | | Fix broken OSS windows build. PiperOrigin-RevId: 210969049
* | Googletest exportmisterg2018-08-301-4/+3
| | | | | | | | | | | | Internal Change PiperOrigin-RevId: 210594341
* | Update gmock-matchers.hGennadiy Civil2018-08-291-3/+4
| |
* | Googletest exportAbseil Team2018-08-282-3/+4
| | | | | | | | | | | | | | | | | | Fix line that was wrapping in the middle of a link This looks uglier, but has the advantage that the link is kept in one piece. PiperOrigin-RevId: 210537337
* | Merge branch 'master' into fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-272-34/+53
|\ \
| * | No longer require a functor passed to ResultOf matcher to define `result_of` ↵Abseil Team2018-08-272-34/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | type. This makes ResultOf more convenient to use. In particular, the matcher now accepts lambdas. PiperOrigin-RevId: 210118509
* | | Use `$<INSTALL_PREFIX>` in `target_include_directories`Dakota Hawkins2018-08-241-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure packages are relocatable, use `$<INSTALL_PREFIX>` in `$<INSTALL_INTERFACE:...>` `target_include_directories`. `$<INSTALL_PREFIX>` was introduced in CMake 2.8.11, which is already being checked for locally. References: - https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#id19 - https://github.com/robotology/how-to-export-cpp-library/blob/claudio/headeronly/src/LibTemplateCMake/CMakeLists.txt#L42 Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
* | Fix #1764 Remove cmake code that leads to a configuration errorWill Vining2018-08-241-21/+0
| | | | | | | | | | | | This step is no longer necessary. The configuration given in the googletest README.md is sufficient to bring in all the googlemock headers.
* | Install CMake export filesStefano Soffia2018-08-221-65/+19
| | | | | | | | Rework of the closed pull request #768
* | Improve CMake exported targets.Dakota Hawkins2018-08-211-6/+33
| | | | | | | | | | | | | | | | | | | | | | I _think_ this represents some of the "best practices" for exporting targets. They'll be available in a `googletest::` namespace (e.g. `googletest::gmock`) with non-namespaced `ALIAS` targets. - Added GOOGLETEST_VERSION variable - Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8 Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
* | Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-204-12/+31
|\ \
| * | googletest exportmisterg2018-08-203-8/+17
| | | | | | | | | | | | | | | | | | - 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457654
| * | Merge branch 'master' into cleanup-cmakeHenry Schreiner2018-08-171-3/+3
| |\ \
| * \ \ Merge branch 'master' into cleanup-cmakeGennadiy Civil2018-08-1563-1557/+2600
| |\ \ \
| * \ \ \ Merge branch 'master' into cleanup-cmakeHenry Schreiner2018-04-0611-457/+1361
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 19:38:48 +0000