Commit Graph

  • 2bd1750ba7 gmock merging -2 Gennadiy Civil 2018-02-27 13:51:09 -05:00
  • 837c246370 Merge branch 'master' into unsigned-wchar Gennadiy Civil 2018-02-27 13:19:57 -05:00
  • ab46d9550b Merge branch 'master' into debug-postfix Gennadiy Civil 2018-02-27 13:19:35 -05:00
  • b951c652ff Merge branch 'master' into variant_matcher Gennadiy Civil 2018-02-27 13:18:55 -05:00
  • 7d15497f75 Merge pull request #1464 from pwnall/death-style Gennadiy Civil 2018-02-27 12:57:51 -05:00
  • 190e2cdd0b Add matcher for std::variant. Xiaoyi Zhang 2018-02-27 11:36:21 -05:00
  • 84ec2e0365 Switch default death test style back to "fast". Victor Costan 2018-02-23 14:55:25 -08:00
  • d4f77c1e3a Merge branch 'master' into win-libcxx2 Gennadiy Civil 2018-02-27 10:00:29 -05:00
  • 20074be19a Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX David Neto 2018-02-26 14:54:16 -05:00
  • 5e1bca7376 Merge branch 'master' into unsigned-wchar Gennadiy Civil 2018-02-26 12:08:48 -05:00
  • ac34e6c950 Merge pull request #1472 from AndersSundmanTobii/master Gennadiy Civil 2018-02-26 11:27:28 -05:00
  • aa31660d18 Merge branch 'master' into master Gennadiy Civil 2018-02-26 11:14:34 -05:00
  • 1d324d8491 Merge pull request #1475 from gennadiycivil/master Gennadiy Civil 2018-02-26 10:10:58 -05:00
  • 4dbb437174 merging unittests - 5 Gennadiy Civil 2018-02-26 09:51:27 -05:00
  • 567b40eeb1 Try to handle unsigned wchar_t (arm) a bit better Scott Graham 2018-02-23 12:28:09 -08:00
  • 004f6a00b2 merging unitests - check 4 Gennadiy Civil 2018-02-23 15:27:11 -05:00
  • 194c99b942 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-02-23 11:51:40 -05:00
  • 3a4cf1a02e Merge pull request #1474 from gennadiycivil/master Gennadiy Civil 2018-02-23 11:51:30 -05:00
  • 29e9ca8774 merging unitests, check Gennadiy Civil 2018-02-23 11:29:35 -05:00
  • 3299a2386c merging unittests - 2 Gennadiy Civil 2018-02-23 11:07:18 -05:00
  • c0563458ee Merge pull request #1473 from gennadiycivil/master Gennadiy Civil 2018-02-23 11:02:53 -05:00
  • b7e0294c51 merging unitests Gennadiy Civil 2018-02-23 10:47:11 -05:00
  • 70e1aad72c Merge pull request #1471 from aleksejkozin/patch-1 Gennadiy Civil 2018-02-23 10:17:05 -05:00
  • 11e1dd257b Removed trailing comma in enum Anders Sundman (asum) 2018-02-23 14:55:24 +01:00
  • 99bb4fe85a Merge branch 'master' into patch-1 Aleksey Kozin 2018-02-23 01:38:54 +03:00
  • a490fb7a9a Merge pull request #1466 from pwnall/fix-death-warn Gennadiy Civil 2018-02-22 17:37:41 -05:00
  • 06568301ec TEST() arguments are invalid in an example Aleksey Kozin 2018-02-23 01:34:26 +03:00
  • ac138b6885 Merge branch 'master' into fix-death-warn Gennadiy Civil 2018-02-22 16:34:27 -05:00
  • 32e62da22a Merge pull request #1469 from gennadiycivil/master Gennadiy Civil 2018-02-22 16:09:17 -05:00
  • df65632489 merges Gennadiy Civil 2018-02-22 15:53:14 -05:00
  • 8a6158717b Fix unused function warning on Mac OS. Victor Costan 2018-02-19 01:56:53 -08:00
  • 3f0cf6b62a Merge pull request #1450 from pwnall/fix-printers Gennadiy Civil 2018-02-15 17:24:19 -05:00
  • 8dd1eb5984 Merge branch 'master' into fix-printers Gennadiy Civil 2018-02-15 15:41:39 -05:00
  • 42140509b6 Merge pull request #1459 from gennadiycivil/master Gennadiy Civil 2018-02-13 16:04:47 -05:00
  • 8248169287 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-02-13 15:26:07 -05:00
  • a3e322b24f cleanup, merges Gennadiy Civil 2018-02-13 15:25:57 -05:00
  • 0d6a674f61 Merge pull request #1458 from gennadiycivil/master Gennadiy Civil 2018-02-13 15:24:31 -05:00
  • 823f139bc7 Merge branch 'master' into fix-printers Gennadiy Civil 2018-02-13 15:00:07 -05:00
  • 68e4f076e5 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-02-13 14:56:31 -05:00
  • 09581b3852 cleanup/merges Gennadiy Civil 2018-02-13 14:56:05 -05:00
  • 38611c5121 Merge pull request #1457 from gennadiycivil/master Gennadiy Civil 2018-02-13 14:51:34 -05:00
  • 069724197c merging, cleaning up Gennadiy Civil 2018-02-13 14:13:52 -05:00
  • 462ef92f75 Merge pull request #1456 from gennadiycivil/master Gennadiy Civil 2018-02-13 14:13:16 -05:00
  • 64290752e9 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-02-13 13:50:52 -05:00
  • ab186a8c49 merges Gennadiy Civil 2018-02-13 13:49:57 -05:00
  • ffc5f5ad3c Merge pull request #1454 from gennadiycivil/master Gennadiy Civil 2018-02-13 12:26:47 -05:00
  • 30d276da03 cxxx11 Gennadiy Civil 2018-02-13 11:48:32 -05:00
  • 3b1fe3ec45 clang warnings Gennadiy Civil 2018-02-13 11:24:09 -05:00
  • d7c966c4de clang warnings Gennadiy Civil 2018-02-13 11:15:03 -05:00
  • 2a23ca0009 https://travis-ci.org/google/googletest/jobs/340995238 Gennadiy Civil 2018-02-13 11:05:01 -05:00
  • a66d209061 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' Gennadiy Civil 2018-02-13 10:23:42 -05:00
  • e76f4ee9fd clang warning https://travis-ci.org/google/googletest/jobs/340978022 Gennadiy Civil 2018-02-13 10:05:43 -05:00
  • 9e072812e3 merges Gennadiy Civil 2018-02-13 09:45:12 -05:00
  • 9d1a80c0fb Merge pull request #1452 from gennadiycivil/master Gennadiy Civil 2018-02-12 16:57:08 -05:00
  • 1a7732a488 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-02-12 16:42:43 -05:00
  • 225e6741ac moving JoinAsTuple to internal Gennadiy Civil 2018-02-12 16:42:12 -05:00
  • b3a1759eac Fix std::iscntrl use in gtest-printers.cc Victor Costan 2018-02-09 22:42:32 -08:00
  • 222607a019 Merge pull request #1451 from gennadiycivil/master Gennadiy Civil 2018-02-12 14:33:35 -05:00
  • b94ba27d44 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-02-12 14:08:17 -05:00
  • d84f58ab10 Merging, coniniue Gennadiy Civil 2018-02-12 14:07:45 -05:00
  • f11a8f9131 Merge branch 'master' into fix-argc Conor Burgess 2018-02-12 17:35:07 +00:00
  • 15392f1a38 Merge pull request #1449 from gennadiycivil/master Gennadiy Civil 2018-02-10 00:01:49 -05:00
  • 575c081227 merging Gennadiy Civil 2018-02-09 17:45:10 -05:00
  • 49fc378e0a merges Gennadiy Civil 2018-02-09 16:02:17 -05:00
  • 9737e63c69 Merge pull request #1439 from DarthGandalf/assert Gennadiy Civil 2018-02-09 13:06:22 -05:00
  • b324a36c35 Merge branch 'master' into assert Gennadiy Civil 2018-02-09 11:42:05 -05:00
  • 22a115055a Merge pull request #1446 from tholsapp/master Gennadiy Civil 2018-02-09 11:34:26 -05:00
  • c211f21906 Merge pull request #1448 from gennadiycivil/master Gennadiy Civil 2018-02-09 11:00:35 -05:00
  • ec7faa943d merges Gennadiy Civil 2018-02-09 10:41:09 -05:00
  • c8510504dd Fixed typos Troy Holsapple 2018-02-07 22:06:00 -08:00
  • 092d088533 Add ability to throw from ASSERT Alexey Sokolov 2018-02-03 23:36:19 +00:00
  • a3c73ed28d Include MSVC14 on PRs as well Gennadiy Civil 2018-02-06 11:06:11 -05:00
  • ea31cb15f0 Merge pull request #1435 from gennadiycivil/master Gennadiy Civil 2018-01-31 15:52:06 -05:00
  • e6ec8bc52f Merges and also adding new bazel build mode Gennadiy Civil 2018-01-31 12:05:18 -05:00
  • e55fded0c8 Code merges Gennadiy Civil 2018-01-30 17:34:22 -05:00
  • a1923a59d5 Merge pull request #1434 from gennadiycivil/master Gennadiy Civil 2018-01-30 13:53:48 -05:00
  • 2a4683021a Ability to optionally depend on Abseil plus upstream of 183716547 Gennadiy Civil 2018-01-30 11:42:03 -05:00
  • 798cc4a78a Merge pull request #1430 from gennadiycivil/master Gennadiy Civil 2018-01-29 09:35:22 -05:00
  • 6c0c389601 Adding tests to googlemock bazel Gennadiy Civil 2018-01-26 16:30:57 -05:00
  • 718fd88d8f Merge pull request #1429 from gennadiycivil/master Gennadiy Civil 2018-01-26 12:22:48 -05:00
  • 92c93802e1 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-26 11:58:17 -05:00
  • fbb48a7708 Code merges Gennadiy Civil 2018-01-26 11:57:58 -05:00
  • cb7271697b Merge pull request #1428 from lidaobing/patch-2 Gennadiy Civil 2018-01-26 10:50:22 -05:00
  • aa82c6f14b Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0 Gennadiy Civil 2018-01-26 10:48:44 -05:00
  • efd49c2d45 Update Documentation.md LI Daobing 2018-01-26 15:36:57 +08:00
  • b8ac390a57 Fix test build issue with GCC7.2. Stefano Soffia 2018-01-25 21:21:54 +01:00
  • 3498a1ac52 Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. Peter Collingbourne 2018-01-24 17:15:18 -08:00
  • f915530791 Pass -EHs-c- to disable exceptions with MSVC. Peter Collingbourne 2018-01-25 14:14:33 -08:00
  • b3a2048beb Update README.md Gennadiy Civil 2018-01-25 10:12:56 -05:00
  • 7cced896a0 Remove Visual Studio 10,11,12 from build matrix Gennadiy Civil 2018-01-25 09:58:51 -05:00
  • 46ab9ecf1f Merge pull request #1421 from gennadiycivil/master Gennadiy Civil 2018-01-24 16:31:29 -05:00
  • b9651c04ef placating gcc and its overzeauls size comparison warnings Gennadiy Civil 2018-01-24 16:06:08 -05:00
  • 264ba3e68e Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-24 14:59:43 -05:00
  • 21cf836003 Merge pull request #1418 from gennadiycivil/master Gennadiy Civil 2018-01-24 14:57:08 -05:00
  • e29805aa5d upstream cl 182543808 Gennadiy Civil 2018-01-24 13:04:36 -05:00
  • 7a2563a514 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-24 12:36:05 -05:00
  • 06c3cce867 revert, lets get this compiled Gennadiy Civil 2018-01-24 12:14:16 -05:00
  • ab9c44ccf0 Merge pull request #1410 from pcc/win-libcxx Gennadiy Civil 2018-01-24 12:07:16 -05:00
  • 80defcec57 Many code merge/upstream changes Gennadiy Civil 2018-01-23 12:33:54 -05:00
  • ad0146bfe2 Merge branch 'master' into win-libcxx Gennadiy Civil 2018-01-23 12:32:44 -05:00