Commit Graph

  • ed811dc79f
    Merge branch 'master' into blaze-build-travis Gennadiy Civil 2017-12-11 10:48:12 -05:00
  • f98c20baa8
    Merge branch 'master' into master bryanzim 2017-12-11 09:37:55 -05:00
  • 55fca1937d
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-09 09:41:02 -05:00
  • 59202300f1
    Merge pull request #1333 from sam-lunt/use-system-includes Gennadiy Civil 2017-12-09 09:38:16 -05:00
  • c82cd5e41e
    Also add documentation around becoming a contributor. Carlos O'Ryan 2017-12-08 23:20:55 -05:00
  • 11841175d8
    Wrong LICENSE file, sorry. Corrected. [skip ci] Carlos O'Ryan 2017-12-08 23:16:24 -05:00
  • bc3320b7f1
    Implement bazel-based builds in Travis. Carlos O'Ryan 2017-12-08 20:59:07 -05:00
  • e22d344c51
    Add Apache-2.0 LICENSE file. Carlos O'Ryan 2017-12-08 17:24:23 -05:00
  • 10ef1d9a1e
    Merge branch 'master' into use-system-includes Gennadiy Civil 2017-12-08 15:11:13 -05:00
  • d6a4478caf
    Merge branch 'master' into master bryanzim 2017-12-08 13:11:34 -05:00
  • cc372a071b
    Merge pull request #1340 from coryan/fix-googlemock-test-build-file Gennadiy Civil 2017-12-08 13:03:20 -05:00
  • cf3adad594
    Add licenses() directive for googlemock/tests. Carlos O'Ryan 2017-12-03 14:24:13 -05:00
  • a30e15b144
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-08 11:56:41 -05:00
  • 8f90d46c8c
    Merge branch 'master' into fix-argc Gennadiy Civil 2017-12-08 11:55:08 -05:00
  • 4aae1600d0
    Merge branch 'master' into master bryanzim 2017-12-08 11:31:31 -05:00
  • cdedd189b2
    Merge branch 'master' into fix-core-dump-shared Gennadiy Civil 2017-12-08 11:12:19 -05:00
  • 4d1f930af8
    Merge pull request #1345 from coryan/fix-travis-build-macOS Gennadiy Civil 2017-12-08 11:09:01 -05:00
  • efc6abae67
    Merge branch 'master' into fix-travis-build-macOS Gennadiy Civil 2017-12-08 11:08:54 -05:00
  • 887a6c6420
    Merge pull request #1348 from wmamrak/master Gennadiy Civil 2017-12-08 11:08:17 -05:00
  • 57bb0bbbf8
    Remove C4996 warning in VS2017 Wojciech Mamrak 2017-12-07 18:20:25 +01:00
  • 3464f76e89
    Improved description of VS std::tuple support Wojciech Mamrak 2017-12-07 18:18:17 +01:00
  • 8d9d6bb0a3
    Improved description of VS std::tuple support Wojciech Mamrak 2017-12-07 18:17:43 +01:00
  • 4d50715c2b
    Fix location of _NSGetArgv correction. Conor Burgess 2017-12-07 11:49:33 +00:00
  • ad383b274d
    Fix value pointed to by _NSGetArgc() on macOS Conor Burgess 2017-12-07 10:53:13 +00:00
  • 4aa05bd4ff
    Only switch to g++-4.9 on Linux. Carlos O'Ryan 2017-12-06 15:33:27 -05:00
  • 11d21b7c2a
    Merge branch 'master' into master bryanzim 2017-12-06 11:09:00 -05:00
  • a868e618c0
    Merge pull request #1225 from brian-peloton/master Gennadiy Civil 2017-12-05 17:19:23 -05:00
  • aea8580ecf
    Run autoconf from top-level directory. Carlos O'Ryan 2017-12-03 14:07:35 -05:00
  • 0663ce9024 Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both. Romain Geissler 2017-12-02 22:47:20 +01:00
  • 9e236748fb
    Merge branch 'master' into master Gennadiy Civil 2017-12-01 16:41:53 -05:00
  • c5cba7d17a
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-01 16:31:29 -05:00
  • ce919c3ddf
    Merge branch 'master' into use-system-includes Gennadiy Civil 2017-12-01 16:29:28 -05:00
  • 247a3d8e5e
    Merge pull request #1324 from whame/master Gennadiy Civil 2017-12-01 16:27:33 -05:00
  • f46bd00e36 make includes system Sam Lunt 2017-11-27 17:07:56 -06:00
  • 6c093a2391 Merge branch 'master' of https://github.com/google/googletest Scott Slack-Smith 2017-11-24 16:00:56 +00:00
  • a7269e24ac replaced back accidently removed static_cast with consistent ImplicitCast_ Bryan Zimmerman 2017-11-22 09:40:48 -05:00
  • 4ba3803f93
    Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2017-11-19 20:17:46 +00:00
  • 49eb76df47
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-11-07 10:32:23 -08:00
  • 82447f23be Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output whame 2017-11-07 15:22:50 +01:00
  • 530885cbd5
    Merge branch 'master' into master bryanzim 2017-10-30 16:58:25 -04:00
  • d175c8bf82
    Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312 Gennadiy Civil 2017-10-30 11:18:33 -04:00
  • 43d6ad75bc
    Merge pull request #1308 from KindDragon/vs2017-ci Gennadiy Civil 2017-10-30 11:11:38 -04:00
  • 8866af0386 remove markdown stars (bold) from code examples Herbert Thielen 2017-10-29 17:12:00 +01:00
  • 1ae4096b9c fix for VS2017 deprecation of ::tr1::tuple change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces Bryan Zimmerman 2017-10-27 14:01:16 -04:00
  • b153bfd8f5 Enable CI for VS2017 Arkady Shapkin 2017-10-25 18:37:57 +03:00
  • 3121b2049e Merge pull request #1304 from m-gupta/gtestapifix Gennadiy Civil 2017-10-25 15:57:21 -04:00
  • e93a15c5a5 Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning Gennadiy Civil 2017-10-25 13:51:48 -04:00
  • 060783b7d2 Merge branch 'master' into gtestapifix m-gupta 2017-10-25 10:24:56 -07:00
  • 20e2de7d8b Remove gcc 6 misleading indentations. Romain Geissler 2016-10-21 17:42:48 +02:00
  • 7684db3271 Merge pull request #1218 from KindDragon/vs-build-fix Gennadiy Civil 2017-10-25 10:33:54 -04:00
  • 840c711e7b Fix gmock tests when std::unary_function unavailable Arkady Shapkin 2017-06-08 02:28:17 +03:00
  • 2641b021fc Fix tests with VS2015 and VS2017 Arkadiy Shapkin 2017-05-03 13:40:33 +03:00
  • 77380cddf7 Enable C++11 features for VS2015 and VS2017 Arkadiy Shapkin 2017-05-03 13:30:11 +03:00
  • 6d0bb75c81 Merge pull request #1139 from chehsunliu/master Gennadiy Civil 2017-10-24 11:27:04 -04:00
  • 1beff241c3 googletest: Add GTEST_API_ attribute to ThreadLocal class. Manoj Gupta 2017-10-17 11:01:39 -07:00
  • c208d8df23 Merge branch 'master' into master Gennadiy Civil 2017-10-20 17:25:41 -04:00
  • 69e48e92de Merge pull request #1300 from gennadiycivil/master Gennadiy Civil 2017-10-18 16:24:59 -04:00
  • 48986f9d4c Merge branch 'master' into master Gennadiy Civil 2017-10-18 16:22:29 -04:00
  • 54c2648bff Workaround for Travis issue https://goo.gl/d5eV8o Gennadiy Civil 2017-10-18 16:18:47 -04:00
  • 27be0dfb53 Merge pull request #1298 from google/revert-1297-master Gennadiy Civil 2017-10-18 10:42:49 -04:00
  • 34aaf58c8b Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…" Gennadiy Civil 2017-10-18 10:42:33 -04:00
  • 5c9543547e Merge pull request #1297 from gennadiycivil/master Gennadiy Civil 2017-10-18 10:40:53 -04:00
  • dfed97a69a Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552 Gennadiy Civil 2017-10-18 10:40:00 -04:00
  • 3282f9ae01 Merge pull request #1288 from joealam/master Gennadiy Civil 2017-10-15 19:15:31 -07:00
  • 963932e7f3 Merge pull request #1292 from DariuszOstolski/master Gennadiy Civil 2017-10-15 19:14:33 -07:00
  • ecb1c3ddb6 #1282: Doc typo fix Dariusz Ostolski 2017-10-14 18:33:19 +02:00
  • 4597ec587c Updated README with information about C runtime dynamic/static linking issues in Windows Joe Alam 2017-10-07 23:34:53 +01:00
  • ceee80c383 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Herbert Thielen 2017-10-04 21:03:47 +02:00
  • 7b6561c56e Merge pull request #1275 from jwakely/pr/1273 Gennadiy Civil 2017-10-03 10:57:19 -04:00
  • b70cf1a663 Use gender-neutral pronouns in comments and docs Jonathan Wakely 2017-09-27 13:31:13 +01:00
  • 98024ad202 Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Herbert Thielen 2017-09-24 10:01:52 +02:00
  • f1a87d73fc Merge pull request #1249 from stkhapugin/master Gennadiy Civil 2017-09-23 16:21:02 -07:00
  • 89f45180e0 Merge branch 'master' into master Gennadiy Civil 2017-09-23 16:51:27 -04:00
  • bfc0ffc8a6 Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized Gennadiy Civil 2017-09-21 10:54:35 -04:00
  • d30a37e743 Revert "Allow macros inside of parametrized test names." Gennadiy Civil 2017-09-21 10:54:14 -04:00
  • ff6796877f Merge pull request #1245 from sheepmaster/2017_09_04_parametrized Gennadiy Civil 2017-09-21 10:52:47 -04:00
  • 4386393837 Merge pull request #1265 from bkircher/redundant-decl Gennadiy Civil 2017-09-20 14:32:57 -04:00
  • cf512a099c Swap reinterpret_cast for static_cast stkhapugin@chromium.org 2017-09-19 12:44:52 +02:00
  • d4af64ca13 Remove redundant declaration Benjamin Kircher 2017-09-16 11:51:36 +02:00
  • deace2546e Merge pull request #1259 from ly2048/patch-1 Gennadiy Civil 2017-09-14 22:30:24 -04:00
  • b55abc3fe0 Merge branch 'master' into patch-1 ly2048 2017-09-15 10:24:09 +08:00
  • b1dd47c278 Merge pull request #1255 from yursha/patch-1 Gennadiy Civil 2017-09-14 11:10:51 -04:00
  • 9681b4c8e6 Add explicit CMAKE_DEBUG_POSTFIX option ly2048 2017-09-14 13:22:04 +08:00
  • 31b6155d7d Merge branch 'master' into patch-1 Alex Yursha 2017-09-13 15:59:32 -07:00
  • 20e62ad24c Merge pull request #1242 from DarthGandalf/expect Gennadiy Civil 2017-09-13 16:33:18 -04:00
  • c9cf07a8ba Make the failure messages from EXPECT_EQ and friends actually symmetric, Alexey Sokolov 2017-09-01 14:21:43 +01:00
  • 834baf3362 Merge branch 'master' into patch-1 Alex Yursha 2017-09-12 11:50:27 -07:00
  • 6133038886 Merge pull request #1227 from aninf-wo/hethi/unused-import Gennadiy Civil 2017-09-12 08:44:58 -04:00
  • ecc5182dbd Merge pull request #1250 from aninf-wo/hethi/remove-linker-warning-on-non-existing-path Gennadiy Civil 2017-09-11 12:15:11 -04:00
  • eb695b0f11 Merge branch 'master' into hethi/unused-import Gennadiy Civil 2017-09-11 11:02:44 -04:00
  • 3663d67170 Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printf Gennadiy Civil 2017-09-11 10:53:09 -04:00
  • 4f68ab5b84 Fix ellipsis position in examples Alex Yursha 2017-09-08 17:20:59 -07:00
  • def0b32119 Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environment Gennadiy Civil 2017-09-08 07:15:19 -04:00
  • 803ab9a860 Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path Herbert Thielen 2017-09-08 11:47:45 +02:00
  • c86fbd766b Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Herbert Thielen 2017-09-08 11:47:14 +02:00
  • 6508a66622 Merge branch 'master' into master Stepan Khapugin 2017-09-08 11:46:31 +02:00
  • 1b5b246ff9 Merge branch 'master' into hethi/unused-import Herbert Thielen 2017-09-08 11:45:58 +02:00
  • 8620328bca Merge branch 'master' into hethi/cleanup-travis-environment Herbert Thielen 2017-09-08 11:38:27 +02:00
  • 894cdb82cb Merge pull request #1251 from aninf-wo/hethi/drop-valgrind-installation-on-travis Gennadiy Civil 2017-09-07 23:04:18 -04:00
  • f3500ce23a Merge pull request #1243 from aninf-wo/hethi/travis-release-build Gennadiy Civil 2017-09-07 23:03:09 -04:00