Commit Graph

  • d5d335b1d0 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-08 13:20:34 -04:00
  • bdf5fd3a98 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-08 13:20:02 -04:00
  • d526632675
    Merge pull request #1708 from drwez/fixFuchsia Gennadiy Civil 2018-08-08 08:58:22 -07:00
  • 07d45437f2 Fix typo breaking Fuchsia build Wez 2018-08-07 16:53:10 -07:00
  • b95a702d5f
    Merge pull request #1707 from gennadiycivil/master Gennadiy Civil 2018-08-07 11:18:54 -07:00
  • 094d7d292f Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-07 14:05:54 -04:00
  • 41e82cadf4 upsream additional printer test Gennadiy Civil 2018-08-07 14:05:42 -04:00
  • 8506852a17
    Merge pull request #1705 from gennadiycivil/master Gennadiy Civil 2018-08-07 10:04:48 -07:00
  • b345bf9090 Formatting changes,small cleanup, no functionality changes Gennadiy Civil 2018-08-07 11:49:47 -04:00
  • dd06b16e76
    Merge pull request #1699 from drwez/suppressDefault Gennadiy Civil 2018-08-07 08:08:39 -07:00
  • 252dc32f96
    Merge branch 'master' into suppressDefault Gennadiy Civil 2018-08-07 07:39:31 -07:00
  • 6f168c1f82
    Merge pull request #1704 from gennadiycivil/master Gennadiy Civil 2018-08-07 07:39:15 -07:00
  • b78c3b8e00 small cleanup, np functional changes Gennadiy Civil 2018-08-07 10:38:41 -04:00
  • e9b05a4d6a
    Merge branch 'master' into master tisi1988 2018-08-07 11:12:00 +02:00
  • 886a74769e
    Merge branch 'master' into suppressDefault Gennadiy Civil 2018-08-06 18:02:42 -07:00
  • 28b71e444c
    Merge pull request #1700 from gennadiycivil/master Gennadiy Civil 2018-08-06 12:41:03 -07:00
  • 24edf4e3bf automatic code sync mgt, comment only Gennadiy Civil 2018-08-06 15:40:21 -04:00
  • c81a34905d
    Merge pull request #1673 from ppaulweber/bug/gcc_8_1_1_build_error Gennadiy Civil 2018-08-06 12:13:47 -07:00
  • 5d2e503574 No default exception handling Wez 2018-08-03 16:26:16 -07:00
  • 61f949387e
    Merge branch 'master' into deprecate Gennadiy Civil 2018-08-03 12:05:07 -04:00
  • 1da26a77c5
    Printers test: fixed compilation bug, due to unnecessary parentheses in declaration Philipp Paulweber 2018-07-19 12:36:47 +02:00
  • 51b65058ad Ignore cmake generated files when used as submodule wxf 2018-08-03 16:23:38 +08:00
  • e887b03e5a
    Merge pull request #1696 from gennadiycivil/master Gennadiy Civil 2018-08-02 23:22:12 -04:00
  • 2a7077fa24 one more fix Gennadiy Civil 2018-08-02 20:03:26 -07:00
  • b929d55704 cmake fixes Gennadiy Civil 2018-08-02 17:46:43 -04:00
  • 0d29f9702d more fixes Gennadiy Civil 2018-08-02 17:32:43 -04:00
  • 95c313e685 add --no_stacktrace_support for json-output-unittest Gennadiy Civil 2018-08-02 16:58:11 -04:00
  • 94f2c6faa7 fixes tests Gennadiy Civil 2018-08-02 16:51:03 -04:00
  • 677df883ec cmake test fixes Gennadiy Civil 2018-08-02 16:24:09 -04:00
  • b7244ff37c cmake fixes Gennadiy Civil 2018-08-02 16:01:00 -04:00
  • 930f0f86e3 cmake tests changes Gennadiy Civil 2018-08-02 15:45:23 -04:00
  • f3511bf1c7 cleaning up and adding test changes to CMake Gennadiy Civil 2018-08-02 14:56:33 -04:00
  • 1cd979a807 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-08-01 22:48:05 +01:00
  • bbc0ac9b1a Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-01 17:26:04 -04:00
  • 5b9b39ff21 Corresponding CMake Changes Gennadiy Civil 2018-08-01 17:25:56 -04:00
  • 8dea630e88 various changes to tests Gennadiy Civil 2018-08-01 17:06:17 -04:00
  • 421f527df3 more test changes Gennadiy Civil 2018-08-01 16:23:20 -04:00
  • 7001dff4fc adding googletest-json-output unitest Gennadiy Civil 2018-08-01 16:12:09 -04:00
  • 09fc73dde9 more test changes Gennadiy Civil 2018-08-01 15:34:30 -04:00
  • 96077bc9f3 more tests changes Gennadiy Civil 2018-08-01 15:02:28 -04:00
  • b888e23fce googletest list tests unitest Gennadiy Civil 2018-08-01 13:49:29 -04:00
  • 35aa4fe924 gtest catch exceptions test and gtest shuffle test Gennadiy Civil 2018-08-01 13:32:07 -04:00
  • a28968d698 changes to googletest break on failure and googletest filter unittests Gennadiy Civil 2018-08-01 11:46:43 -04:00
  • e5e2ef7cd2
    Merge pull request #1695 from gennadiycivil/master Gennadiy Civil 2018-08-01 11:45:45 -04:00
  • d75922ca1c changes for googletest env var test Gennadiy Civil 2018-08-01 11:35:13 -04:00
  • 38486eb03e googltest-color-test changes Gennadiy Civil 2018-08-01 11:32:08 -04:00
  • 6324796be1 googletest-output-test changes Gennadiy Civil 2018-08-01 11:28:24 -04:00
  • 16c65a476a
    Merge branch 'master' into master Gennadiy Civil 2018-08-01 11:09:34 -04:00
  • 572b07ff8d
    Merge pull request #1685 from einsteinsfool/master Gennadiy Civil 2018-08-01 11:09:18 -04:00
  • e69a1a8340 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-01 11:07:30 -04:00
  • 539ee4bc54 Formatting changes and upstreaming one test Gennadiy Civil 2018-08-01 11:07:22 -04:00
  • 25e1436b08
    Merge branch 'master' into master tisi1988 2018-08-01 12:11:18 +02:00
  • 6269264dfe
    Merge branch 'master' into deprecate Gennadiy Civil 2018-07-30 16:11:06 -04:00
  • f978c651ed
    Merge branch 'master' into master Gennadiy Civil 2018-07-30 14:01:17 -04:00
  • 4f160f7370
    Merge pull request #1691 from gennadiycivil/master Gennadiy Civil 2018-07-30 13:57:17 -04:00
  • 012528ccab Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-07-30 13:35:18 -04:00
  • b7cb1bc6f9 small tweaks, OSS merge cl 206357486 Gennadiy Civil 2018-07-30 13:31:46 -04:00
  • 0048647619
    Merge pull request #1688 from gennadiycivil/master Gennadiy Civil 2018-07-27 15:15:11 -04:00
  • ec13264af4 added missing comments Gennadiy Civil 2018-07-27 15:05:20 -04:00
  • 984cba30ed Formatting changes for automatic code management Gennadiy Civil 2018-07-27 11:15:08 -04:00
  • 6cacb41935
    Merge branch 'master' into deprecate Gennadiy Civil 2018-07-26 13:04:53 -04:00
  • 309e8a271e Updated broken and outdated URLs Piotr Kąkol 2018-07-25 19:19:26 +02:00
  • 40904f8970
    Merge pull request #1684 from gennadiycivil/master Gennadiy Civil 2018-07-25 10:43:26 -04:00
  • ed1edf641d Formatting changes, code sync Gennadiy Civil 2018-07-25 10:24:13 -04:00
  • 78b49242d1
    Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp Gennadiy Civil 2018-07-24 10:53:00 -04:00
  • a68f0c201d
    Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp Gennadiy Civil 2018-07-23 15:51:39 -04:00
  • 82c858b3ad
    Merge pull request #1678 from stianval/master Gennadiy Civil 2018-07-23 11:59:29 -04:00
  • 1ae4fdb790
    Merge branch 'master' into master tisi1988 2018-07-23 10:10:26 +02:00
  • bb9fc6f66e
    Update primer.md Stian Valle 2018-07-21 15:50:45 +02:00
  • 7abf99d941
    Update primer.md Stian Valle 2018-07-21 15:40:57 +02:00
  • baf2115a59
    Update primer.md Stian Valle 2018-07-21 15:29:58 +02:00
  • 534570b5bd
    Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp Masaru Tsuchiyama 2018-07-21 09:18:54 +09:00
  • fd4f7cc729
    Merge branch 'master' into deprecate Gennadiy Civil 2018-07-20 15:53:16 -04:00
  • 2a151c93c1
    Merge pull request #1676 from gennadiycivil/master Gennadiy Civil 2018-07-20 11:46:26 -04:00
  • a02af2f689 code merge Gennadiy Civil 2018-07-20 11:28:58 -04:00
  • c62c79432b
    Merge pull request #1668 from duxiuxing/googletest_for_asam Gennadiy Civil 2018-07-20 10:30:23 -04:00
  • d8db0ca9cf
    Merge branch 'master' into googletest_for_asam duxiuxing 2018-07-20 06:16:21 +08:00
  • 2eb4396007 Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio 杜修杏 2018-07-20 06:15:13 +08:00
  • 6ce9b98f54
    Merge pull request #1674 from gennadiycivil/master Gennadiy Civil 2018-07-19 13:31:15 -04:00
  • 61b8197217
    Merge branch 'master' into master Gennadiy Civil 2018-07-19 12:54:43 -04:00
  • 0c17888bcf code sync Gennadiy Civil 2018-07-19 12:42:39 -04:00
  • 1f9c668a04
    Merge branch 'master' into deprecate Gennadiy Civil 2018-07-19 11:07:10 -04:00
  • 5b19054b02
    Merge branch 'master' into googletest_for_asam duxiuxing 2018-07-19 18:38:20 +08:00
  • 40cd5d1170
    Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp Masaru Tsuchiyama 2018-07-19 06:51:13 +09:00
  • 1370e7658b
    Merge pull request #1669 from syohex/ignore-ds-store Gennadiy Civil 2018-07-18 14:20:37 -04:00
  • a3509a5aa4 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-07-18 14:15:58 -04:00
  • 43163c19d5
    Merge branch 'master' into ignore-ds-store Gennadiy Civil 2018-07-18 14:09:06 -04:00
  • 4235fff7f4
    Merge pull request #1671 from gennadiycivil/master Gennadiy Civil 2018-07-18 11:54:56 -04:00
  • 3530ab9e43 Code sync Gennadiy Civil 2018-07-18 11:51:14 -04:00
  • d41bfd732f Fix link Gennadiy Civil 2018-07-18 11:38:18 -04:00
  • 8d07cfd053 Code sync, mostly formatting and removing outdates Gennadiy Civil 2018-07-18 11:30:36 -04:00
  • 7e73a7ae6e Formatting and a link Gennadiy Civil 2018-07-18 11:17:19 -04:00
  • 20ef7944a4
    Merge pull request #1667 from hckr/patch-1 Gennadiy Civil 2018-07-18 10:21:46 -04:00
  • 2211061e64
    Merge pull request #1670 from gennadiycivil/master Gennadiy Civil 2018-07-18 10:17:18 -04:00
  • 234958def5
    Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp Masaru Tsuchiyama 2018-07-18 08:03:49 +09:00
  • 4abbb774c3 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-07-17 17:47:54 -04:00
  • 5437926b22 Docs sync Gennadiy Civil 2018-07-17 17:47:25 -04:00
  • a091b75332 Ignore .DS_Store file Syohei YOSHIDA 2018-07-17 18:39:29 +09:00
  • 65a49a73f0 Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss duxiuxing 2018-07-17 15:46:47 +08:00
  • 021c308069
    Fix broken links to FAQ in primer.md Jakub Młokosiewicz 2018-07-17 00:49:31 +02:00