aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\| | |
| | * | | Comments changes, no functionality changesGennadiy Civil2018-08-1444-88/+44
| | | | |
| | * | | Code formatting changes, clean up, no functionality changesGennadiy Civil2018-08-142-12/+6
| | | | |
| | * | | formatting custom/README.mdGennadiy Civil2018-08-131-1/+1
| | | | |
| | * | | formatting for new READMEsGennadiy Civil2018-08-131-6/+6
| | | | |
| | * | | Move instructions into custom/README filesGennadiy Civil2018-08-133-13/+18
| | | | |
| * | | | Change location of generated pkg-config files from CMAKE_BINARY_DIR to ↵Elias Daler2018-08-131-3/+3
| |/ / / | | | | | | | | | | | | gmock/gtest_BINARY_DIR (#1717)
| * | | comment cleanupGennadiy Civil2018-08-131-2/+0
| | | |
| * | | Update gmock_output_test.pyGennadiy Civil2018-08-091-1/+1
| | | |
| * | | Formatting change for auto code management, no functionality changesGennadiy Civil2018-08-091-1/+2
| | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletest
| * | | Formatting changes,small cleanup, no functionality changesGennadiy Civil2018-08-071-1/+2
| | | |
| * | | small cleanup, np functional changesGennadiy Civil2018-08-071-2/+0
| | | |
| * | | automatic code sync mgt, comment onlyGennadiy Civil2018-08-061-0/+2
| | | |
| * | | Merge branch 'master' into masterGennadiy Civil2018-08-014-7/+7
| |\ \ \
| | * \ \ Merge branch 'master' into masterGennadiy Civil2018-07-3023-1/+47
| | |\ \ \
| | * | | | Updated broken and outdated URLsPiotr Kąkol2018-07-254-7/+7
| | | | | |
| * | | | | Formatting changes and upstreaming one testGennadiy Civil2018-08-012-3/+0
| | |/ / / | |/| | |
| * | | | Formatting changes for automatic code managementGennadiy Civil2018-07-2723-1/+47
| |/ / /
| * | | Formatting changes, code syncGennadiy Civil2018-07-251-2/+1
| | | |
| * | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-215-28/+67
| |\ \ \
| | * | | code mergeGennadiy Civil2018-07-202-1/+18
| | | | |
| | * | | Merge branch 'master' into googletest_for_asamduxiuxing2018-07-202-7/+29
| | |\ \ \
| | | * | | code syncGennadiy Civil2018-07-192-4/+9
| | | | | |
| | | * | | Code syncGennadiy Civil2018-07-181-3/+20
| | | | | |
| | * | | | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio杜修杏2018-07-202-4/+4
| | | | | |
| | * | | | Merge branch 'master' into googletest_for_asamduxiuxing2018-07-193-204/+3
| | |\| | |
| | * | | | Fix warning C4819: The file contains a character that cannot be represented ↵duxiuxing2018-07-173-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | in the current code page (936). Save the file in Unicode format to prevent data loss
| * | | | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-193-204/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Code sync, mostly formatting and removing outdatesGennadiy Civil2018-07-182-203/+2
| | | | | |
| | * | | | Formatting and a linkGennadiy Civil2018-07-181-1/+1
| | |/ / /
| * | | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-181-3/+2
| |\| | |
| | * | | Put ifdef guard after the includes.Adrian Moran2018-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
| | * | | Avoid full test in no exceptions are enabled.Adrian Moran2018-07-121-5/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
| | * | | Fix issue #1654.Adrian Moran2018-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
| * | | | This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.Masaru Tsuchiyama2018-06-302-8/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-ASCII charactors are interpreted as Shift-JIS on the environment. But the charators in the files are non Shift-JIS charactors and the compiler stops compiling with C4819. To fix the errors, remove non-ASCII charactors.
| * | | Removed "Documentation.md" not adding value and not consitent with internal docsGennadiy Civil2018-06-111-1/+0
| | | |
| * | | Rename AdvancedGuide.md to advanced.md and adjust the links. Gennadiy Civil2018-06-113-3/+3
| | | | | | | | | | | | Part of documentation rationalization work
| * | | Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion ↵Gennadiy Civil2018-06-112-9/+9
| | | | | | | | | | | | | | | | rationalzation