aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| |\ \ \ \
| * | | | | Clean up cache non-advanced variable for subprojectHenry Fredrick Schreiner2018-04-051-4/+14
| | | | | |
* | | | | | Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-1669-2184/+5391
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | googletest exportAbseil Team2018-08-151-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 208874130 Copybara tweaks, testing various round-trip sutuations(fu... by misterg <misterg@google.com> - 208880646 Fix header guards and remove special case copybara by misterg <misterg@google.com> - 208874252 Copybara tweaks for googletest reversible transform by misterg <misterg@google.com> - 208853103 Adding a flow to export PR from GitHub into Google3 and a... by misterg <misterg@google.com> - 208708150 Removing leakr-sensitive words. by misterg <misterg@google.com> - 208672083 Import of OSS PR 1665 by misterg <misterg@google.com> - 208663904 Remove LEAKR "author" warnings for googletest copybara ex... by misterg <misterg@google.com> - 208646244 Incrementally finalizing OSS<->google3 transforms by misterg <misterg@google.com> - 208548323 Move custom google3 only code to custom/ by misterg <misterg@google.com> - 208234974 Removed scrubs, replaced with reversible transforms by misterg <misterg@google.com> - 208211213 Move custom tests under custom by misterg <misterg@google.com> - 208082996 Replace of OSS insert with reversible replace by misterg <misterg@google.com> - 208072299 Replace scrubs with reversible replaces, incrementally ge... by misterg <misterg@google.com> - 208059357 Replace scrub with reversible replace by misterg <misterg@google.com> - 208055415 Fixing GCC brace warning that shows up in OSS with GCC8 a... by misterg <misterg@google.com> - 207933728 Incrementally getting close to the reversible transformat... by misterg <misterg@google.com> - 207917581 Removing stripping with replace dictionary entries to eas... by misterg <misterg@google.com> - 207911026 Incremental Tweaks, on the way to reversible google3<-> g... by misterg <misterg@google.com> - 207905179 Removing unnecessary comments stripping by misterg <misterg@google.com> - 207901741 Fix typo in Fuchsia death-test implementation. by Abseil Team <absl-team@google.com> - 207776408 Move custom tests into /custom by misterg <misterg@google.com> - 207746583 Remove stripping for printer for absl:variant by misterg <misterg@google.com> - 207733597 Suppress default exception handling for death-test proces... by Abseil Team <absl-team@google.com> - 207719598 Import of googletest from Github. by misterg <misterg@google.com> - 207283991 PR1673, extra parentheses in declaration cause GCC 8.1.1 ... by misterg <misterg@google.com> - 206986279 Fix Duplicate definition, (original in googletest-test_te... by misterg <misterg@google.com> - 206980794 Allow googletest-json-output unitest to handle supporting... by misterg <misterg@google.com> - 206957064 Refactor to avoid OSS round-trip transformation problems ... by misterg <misterg@google.com> - 206760733 Fixed weird syntax in these tests that was causing OSS tr... by misterg <misterg@google.com> - 206750694 Tweak copybara, by misterg <misterg@google.com> - 206611945 Make files consistent to enable copybara round-trip trans... by misterg <misterg@google.com> - 206589404 OSS changes to open source two more tests by misterg <misterg@google.com> - 206355044 Fixing copybara (was missing comment) by misterg <misterg@google.com> - 206323492 Make reversible transforms possible for Copybara OSS<->go... by misterg <misterg@google.com> - 206011852 Consolidate various copybara files into one file. by misterg <misterg@google.com> - 205999518 remove weird char, should be space. pump and generated .h... by misterg <misterg@google.com> - 205897244 Small cleanups to avoid potentially hard-to-reverse OSS t... by misterg <misterg@google.com> - 205894405 Simplifying include path for tests. by misterg <misterg@google.com> - 205892873 Removing obsolete files by misterg <misterg@google.com> - 205873647 Simplifying include path for samples. by misterg <misterg@google.com> - 205712910 Continue restructuring, will have common copybara file to... by misterg <misterg@google.com> - 205711819 Removing non-ASCII chars by misterg <misterg@google.com> - 205702635 Refactor internal googletest name to match OSS Name by misterg <misterg@google.com> - 205403311 Comments change by misterg <misterg@google.com> - 205246538 OSS community (https://github.com/google/googletest/pull/... by misterg <misterg@google.com> - 205242422 Moving RE2 into custom where it rightfully belongs by misterg <misterg@google.com> - 205138666 Add a 3-ary Property() matcher overload for ref-qualified... by Abseil Team <absl-team@google.com> - 205128154 Automated g4 rollback of changelist 205108639. by misterg <misterg@google.com> - 205108639 Moving RE2 into custom where it rightfully belongs by misterg <misterg@google.com> - 205102342 Comment link fix by misterg <misterg@google.com> - 205097052 OSS sync, still need to worry about not C++11 by misterg <misterg@google.com> - 205080271 Keeping up with the changes, ensure that the code still t... by misterg <misterg@google.com> - 204815384 Mark the various RE legacy versions of the matchers as de... by Abseil Team <absl-team@google.com> - 204744294 OSS, someone noticed that if GTEST_HAS_EXCEPTIONS is set ... by misterg <misterg@google.com> - 204363541 Add stacktrace support to the non-Google3 version of Goog... by Abseil Team <absl-team@google.com> - 204330832 Google Test: absl::variant is now open source, so add the by Abseil Team <absl-team@google.com> - 204130690 Bringing in OSS PR 1647 by misterg <misterg@google.com> - 203979061 Set 'reason' field for leakr.disable_check() transformati... by Abseil Team <absl-team@google.com> - 203954557 Fixing comments, otherwise copybara leaves extra "//" in ... by misterg <misterg@google.com> - 203487065 Correctly handle legacy regular expressions in googletest... by Abseil Team <absl-team@google.com> - 201997367 Remove references to GTEST_HAS_PROTOBUF_. by Abseil Team <absl-team@google.com> - 201735597 Upgrade gUnit from RE to RE2 -- Step 3/4 by Abseil Team <absl-team@google.com> - 201229160 Upgrade gUnit from RE to RE2 -- Step 1/4 by Abseil Team <absl-team@google.com> - 201228020 Remove extra copy of gunit samples - there should really ... by misterg <misterg@google.com> - 200602156 Eliminate GTEST_TEST_FILTER_ENV_VAR_. by Abseil Team <absl-team@google.com> - 200500026 Make RegisterTasks faster by Abseil Team <absl-team@google.com> - 200361990 Add IWYU pragmas to gmock headers. by Abseil Team <absl-team@google.com> - 200292286 Fix speling by Abseil Team <absl-team@google.com> - 200222319 Adding docs to copybara. by misterg <misterg@google.com> - 199815917 Fuchsia: Change fdio include path. by Abseil Team <absl-team@google.com> - 199195290 Remove launchpad dependency from Fuchsia. by Abseil Team <absl-team@google.com> - 199134849 Add printer for std::nullptr_t. by Abseil Team <absl-team@google.com> - 198710999 Properly decay variadic matchers by Abseil Team <absl-team@google.com> - 197733704 WIP - copybara script capable of google3-to-github by misterg <misterg@google.com> - 197166689 Keeping up, sync cl/197012432 to combined "googletest" di... by misterg <misterg@google.com> - 196253300 Keep up with changes,cl/196162435 by misterg <misterg@google.com> - 195816901 go/googletest-plan by misterg <misterg@google.com> - 195816542 Moving http://cl/167016557 and http://cl/195690905 into c... by misterg <misterg@google.com> - 195712930 Following up for http://cl/195677772 More fixing typos, p... by misterg <misterg@google.com> - 195702162 Moving http://cl/195020996 into combined dir by misterg <misterg@google.com> - 195677772 Fix typos, the original IWYU was by misterg <misterg@google.com> - 195249681 go/googletest-plan , Combine gUnit and gMock into third_p... by misterg <misterg@google.com> PiperOrigin-RevId: 208874130
| * | | | Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-1410-17/+11
| |\ \ \ \
| | * | | | more comments changesGennadiy Civil2018-08-141-1/+1
| | | | | |
| | * | | | more comments changesGennadiy Civil2018-08-142-2/+2
| | | | | |
| | * | | | Comments changes, no functionality changes. Gennadiy Civil2018-08-148-14/+8
| | | | | |
| * | | | | Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-1447-113/+68
| |\| | | |