Commit Graph

  • dfa853b63d
    Merge pull request #1510 from gennadiycivil/master Gennadiy Civil 2018-03-22 16:21:26 -04:00
  • b7c568326c merging, gmock -1 Gennadiy Civil 2018-03-22 15:35:37 -04:00
  • a1692ed133
    Merge branch 'master' into master Gennadiy Civil 2018-03-22 12:56:01 -04:00
  • 4e89c76db8 reverting gtest_list_tests_unittest.py Gennadiy Civil 2018-03-22 12:37:38 -04:00
  • eaaa422c52
    Update appveyor.yml Gennadiy Civil 2018-03-22 11:48:21 -04:00
  • da71e8c870 more merges Gennadiy Civil 2018-03-22 10:58:18 -04:00
  • 0f6567954f more merges Gennadiy Civil 2018-03-22 10:56:35 -04:00
  • 691e38e518 More merges Gennadiy Civil 2018-03-21 16:31:31 -04:00
  • dccc2d6754
    Merge pull request #1508 from gennadiycivil/master Gennadiy Civil 2018-03-19 13:32:25 -04:00
  • a3c2e107ae cl 189032107, again Gennadiy Civil 2018-03-16 15:56:31 -04:00
  • 080fcbe0aa cl 189032107 Gennadiy Civil 2018-03-16 13:36:36 -04:00
  • a178cc7ef7 merge, again, IsRecursiveContainer Gennadiy Civil 2018-03-15 14:31:37 -04:00
  • a325ad2db5
    Merge pull request #1504 from gennadiycivil/master Gennadiy Civil 2018-03-14 11:21:53 -04:00
  • 262aaf2f1d erging, cont Gennadiy Civil 2018-03-14 10:49:18 -04:00
  • 2814b4b089 merging, merging Gennadiy Civil 2018-03-13 16:02:05 -04:00
  • a719320a3c fixing, was removing too much Gennadiy Civil 2018-03-13 11:53:27 -04:00
  • 5461f63d01 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-13 11:13:58 -04:00
  • af463c43ac More merges, removing old dead code Gennadiy Civil 2018-03-13 11:13:37 -04:00
  • f35fe6de3b
    Merge pull request #1503 from sheepmaster/upstream_188748737 Gennadiy Civil 2018-03-12 15:04:50 -04:00
  • fc437ef4b2
    Merge branch 'master' into upstream_188748737 Bernhard Bauer 2018-03-12 18:15:35 +00:00
  • 7b70413e0c Allow macros inside of parametrized test names. Bernhard Bauer 2018-03-12 13:51:04 +00:00
  • abc6e943e0
    Merge pull request #1502 from gennadiycivil/master Gennadiy Civil 2018-03-12 12:39:13 -04:00
  • cf9d6344d2 merges-port(1) Gennadiy Civil 2018-03-12 11:51:44 -04:00
  • 9bda90b7e5
    Merge pull request #1497 from gennadiycivil/master Gennadiy Civil 2018-03-07 16:14:48 -05:00
  • e891900666 Merging, XML tests Gennadiy Civil 2018-03-07 15:57:55 -05:00
  • 703b4a85a2
    Merge pull request #1493 from gennadiycivil/master Gennadiy Civil 2018-03-05 16:15:02 -05:00
  • 89d6f70f34 merges-8 Gennadiy Civil 2018-03-05 15:53:36 -05:00
  • 617e2c5615
    Merge pull request #1492 from gennadiycivil/master Gennadiy Civil 2018-03-05 15:52:38 -05:00
  • 995a9dfa69 merges-7 Gennadiy Civil 2018-03-05 15:21:48 -05:00
  • ae4480f923
    Merge pull request #1491 from gennadiycivil/master Gennadiy Civil 2018-03-05 14:41:37 -05:00
  • 086825de5d merges-6 Gennadiy Civil 2018-03-05 14:21:41 -05:00
  • 731dbc4a78
    Merge pull request #1490 from gennadiycivil/master Gennadiy Civil 2018-03-05 14:17:40 -05:00
  • 94d78ea14b Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-05 13:59:08 -05:00
  • 8385928428 merges-3 Gennadiy Civil 2018-03-05 13:51:39 -05:00
  • c3a007f3cf
    Merge pull request #1489 from gennadiycivil/master Gennadiy Civil 2018-03-05 13:51:15 -05:00
  • 73bf41299d Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-05 13:28:17 -05:00
  • dbf63e38a4 merges-2 Gennadiy Civil 2018-03-05 13:28:13 -05:00
  • a7ffeca974
    Merge pull request #1488 from gennadiycivil/master Gennadiy Civil 2018-03-05 13:21:59 -05:00
  • a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-05 12:26:24 -05:00
  • 0d5e01ad7b Merges-1 Gennadiy Civil 2018-03-05 12:26:15 -05:00
  • 915c8d051d
    Merge pull request #1477 from sgraham/unsigned-wchar Gennadiy Civil 2018-03-05 11:03:08 -05:00
  • 829a8c966b
    Merge branch 'master' into unsigned-wchar Gennadiy Civil 2018-03-05 10:43:19 -05:00
  • 6d089311ca Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-03-05 09:02:59 +00:00
  • a7a7f51d35
    Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-03-05 02:25:59 +00:00
  • 6c73adfc03
    Merge pull request #1486 from petrhosek/json-stacktrace Gennadiy Civil 2018-03-02 14:32:06 -05:00
  • 7a2050d4d7 Use a full message in the JSON output for failures Petr Hosek 2018-03-01 13:19:34 -08:00
  • f8fbe1c821
    Merge branch 'master' into unsigned-wchar Gennadiy Civil 2018-03-01 11:18:17 -05:00
  • 447d58b4ee
    Merge pull request #1485 from coryan/parallelize-appveyor Gennadiy Civil 2018-02-28 15:23:40 -05:00
  • 18d270e335
    Merge pull request #1479 from petrhosek/json Gennadiy Civil 2018-02-28 14:50:35 -05:00
  • 3817871beb
    Merge branch 'master' into json Gennadiy Civil 2018-02-28 14:39:17 -05:00
  • 3431b69909
    Add options to parallelize builds. Carlos O'Ryan 2018-02-28 11:28:57 -05:00
  • 9557d29b7a
    Merge pull request #1481 from dneto0/debug-postfix Gennadiy Civil 2018-02-28 08:55:39 -05:00
  • 66d71756a7
    Merge branch 'master' into debug-postfix Gennadiy Civil 2018-02-28 08:43:57 -05:00
  • 6baf17e9d1 Support JSON output format in addition to XML Petr Hosek 2018-02-26 01:15:50 -08:00
  • fe1144246e
    Merge pull request #1482 from zhangxy988/variant_matcher Gennadiy Civil 2018-02-27 16:58:28 -05:00
  • e1622337ae Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher Xiaoyi Zhang 2018-02-27 16:06:07 -05:00
  • 576d689c19
    Merge branch 'master' into variant_matcher Xiaoyi Zhang 2018-02-27 16:03:36 -05:00
  • 62be6f34d1 Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher Xiaoyi Zhang 2018-02-27 16:01:14 -05:00
  • 2eb31c185c Add documentation for VariantWith. Xiaoyi Zhang 2018-02-27 16:00:42 -05:00
  • a9f2368dc0
    Merge pull request #1483 from gennadiycivil/master Gennadiy Civil 2018-02-27 14:39:41 -05:00
  • ba40fd1456
    Merge branch 'master' into master Gennadiy Civil 2018-02-27 14:10:27 -05:00
  • ce61dc54a2
    Merge pull request #1423 from pcc/win-libcxx2 Gennadiy Civil 2018-02-27 14:00:29 -05:00
  • 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