Commit Graph

  • 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
  • 3c5e064ca0
    Merge pull request #1417 from gennadiycivil/master Gennadiy Civil 2018-01-23 12:32:00 -05:00
  • 58df576056 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-23 10:16:38 -05:00
  • 6723b6c588 Merging, upstream http://cl/182836545 Gennadiy Civil 2018-01-23 10:15:28 -05:00
  • bbb17ad0f7 more code merge Gennadiy Civil 2018-01-22 15:28:55 -05:00
  • f1c87ad9f5 merges, cl/155419551 and other Gennadiy Civil 2018-01-22 15:20:19 -05:00
  • 83fa0cb17d
    Merge pull request #1415 from gennadiycivil/master Gennadiy Civil 2018-01-22 15:18:03 -05:00
  • 9bc86661f8 more merging Gennadiy Civil 2018-01-22 14:43:51 -05:00
  • a0435a54ce merging Gennadiy Civil 2018-01-22 14:14:05 -05:00
  • 8d707dfe81 code merge Gennadiy Civil 2018-01-22 11:47:30 -05:00
  • 62ba5d91d0
    Merge pull request #1401 from eidosmontreal/support_xboxone Gennadiy Civil 2018-01-19 11:59:36 -05:00
  • 1489dc8daa
    Merge branch 'master' into support_xboxone Gennadiy Civil 2018-01-18 17:42:34 -05:00
  • 20b53ad786
    Merge branch 'master' into win-libcxx Gennadiy Civil 2018-01-18 17:41:36 -05:00
  • 051053054d
    Merge pull request #1412 from gennadiycivil/master Gennadiy Civil 2018-01-18 14:52:37 -05:00
  • b1623e9144 Adding python tests to Bazel build file. Gennadiy Civil 2018-01-18 14:32:31 -05:00
  • 8d733dc195
    Merge pull request #1407 from ted-xp/master Gennadiy Civil 2018-01-18 09:47:22 -05:00
  • 8e862211a2 Use fully qualified in examples Fedor Trushkin 2018-01-18 10:38:25 +01:00
  • 354fc8d8b1 Document ScopedTrace utility Fedor Trushkin 2018-01-18 10:34:05 +01:00
  • ba99a04be2 Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++. Peter Collingbourne 2018-01-11 19:36:25 -08:00
  • 9c82e7745c Expose ScopedTrace utility in public interface Fedor Trushkin 2018-01-17 16:41:59 +01:00
  • 1b077667bd
    Merge pull request #1402 from gennadiycivil/master Gennadiy Civil 2018-01-15 18:48:35 -05:00
  • 08b323f717 Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 18:16:11 -05:00
  • 9195571c69 Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 17:39:33 -05:00
  • 6d04de7419 Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 17:36:45 -05:00
  • b9e297838d Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 17:34:46 -05:00
  • 304be8f009 Test files for corresponding changes Gennadiy Civil 2018-01-15 17:15:52 -05:00
  • 6befe422f2 Test files for corresponding changes Gennadiy Civil 2018-01-15 16:59:57 -05:00
  • f45c22c482 Test files for corresponding changes Gennadiy Civil 2018-01-15 16:56:17 -05:00
  • 5f4ce9d884 Test files for corresponding changes Gennadiy Civil 2018-01-15 16:46:16 -05:00
  • 26085d7675 Merge branch 'master' of github.com:gennadiycivil/googletest Gennadiy Civil 2018-01-15 16:23:37 -05:00
  • d629744ec0 More code merges Gennadiy Civil 2018-01-15 16:23:23 -05:00
  • 6c86598805 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-15 16:22:59 -05:00
  • 822c6201d3
    Merge branch 'master' into master Gennadiy Civil 2018-01-15 16:07:45 -05:00
  • da1f7fe1e7 Code merging Gennadiy Civil 2018-01-15 16:06:32 -05:00
  • 051fe2fa05
    Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared Gennadiy Civil 2018-01-15 15:37:20 -05:00
  • f6887b5cb9
    Merge branch 'master' into fix-core-dump-shared Gennadiy Civil 2018-01-13 15:06:57 -05:00
  • 63ded6c27a
    Merge pull request #1400 from gennadiycivil/master Gennadiy Civil 2018-01-12 21:47:26 -05:00
  • 27bb844e5c
    Merge branch 'master' into fix-argc Conor Burgess 2018-01-12 16:00:39 +00:00
  • ea8f6f0e69 Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone Gaspard Petit 2018-01-12 10:20:46 -05:00