2063 Commits

Author SHA1 Message Date
Gennadiy Civil
00fc0d24d1 Formatting tweaks, no functionality changes 2018-08-08 15:14:21 -04:00
Gennadiy Civil
0eeb1afcac code management changes, no functionalty changes 2018-08-08 14:41:21 -04:00
Gennadiy Civil
61799bd500
Merge pull request #1710 from gennadiycivil/master
Formatting Changes and small code merge
2018-08-08 10:34:21 -07:00
Gennadiy Civil
d31266e4ec Merge branch 'master' of github.com:gennadiycivil/googletest 2018-08-08 13:22:10 -04:00
Gennadiy Civil
35e1959125 Formatting Changes and small code merge 2018-08-08 13:21:45 -04:00
Gennadiy Civil
d5d335b1d0 Merge branch 'master' of https://github.com/google/googletest 2018-08-08 13:20:34 -04:00
Gennadiy Civil
bdf5fd3a98 Merge branch 'master' of https://github.com/google/googletest
Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest
2018-08-08 13:20:02 -04:00
Gennadiy Civil
d526632675
Merge pull request #1708 from drwez/fixFuchsia
Fix typo breaking Fuchsia build.
2018-08-08 08:58:22 -07:00
Wez
07d45437f2 Fix typo breaking Fuchsia build 2018-08-07 16:53:10 -07:00
Gennadiy Civil
b95a702d5f
Merge pull request #1707 from gennadiycivil/master
upsream additional printer test
2018-08-07 11:18:54 -07:00
Gennadiy Civil
094d7d292f Merge branch 'master' of https://github.com/google/googletest 2018-08-07 14:05:54 -04:00
Gennadiy Civil
41e82cadf4 upsream additional printer test 2018-08-07 14:05:42 -04:00
Gennadiy Civil
8506852a17
Merge pull request #1705 from gennadiycivil/master
Formatting changes,small cleanup,  no functionality changes
2018-08-07 10:04:48 -07:00
Gennadiy Civil
b345bf9090 Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
Gennadiy Civil
dd06b16e76
Merge pull request #1699 from drwez/suppressDefault
Suppress default exception handling
2018-08-07 08:08:39 -07:00
Gennadiy Civil
252dc32f96
Merge branch 'master' into suppressDefault 2018-08-07 07:39:31 -07:00
Gennadiy Civil
6f168c1f82
Merge pull request #1704 from gennadiycivil/master
small cleanup, np functional changes
2018-08-07 07:39:15 -07:00
Gennadiy Civil
b78c3b8e00 small cleanup, np functional changes 2018-08-07 10:38:41 -04:00
Gennadiy Civil
886a74769e
Merge branch 'master' into suppressDefault 2018-08-06 18:02:42 -07:00
Gennadiy Civil
28b71e444c
Merge pull request #1700 from gennadiycivil/master
automatic code sync mgt, comment only
2018-08-06 12:41:03 -07:00
Gennadiy Civil
24edf4e3bf automatic code sync mgt, comment only 2018-08-06 15:40:21 -04:00
Gennadiy Civil
c81a34905d
Merge pull request #1673 from ppaulweber/bug/gcc_8_1_1_build_error
Printers test: fixed compilation bug, due to unnecessary parentheses in declaration
2018-08-06 12:13:47 -07:00
Wez
5d2e503574 No default exception handling 2018-08-03 16:26:16 -07:00
Philipp Paulweber
1da26a77c5
Printers test: fixed compilation bug, due to unnecessary parentheses in declaration 2018-08-03 12:01:30 +02:00
Gennadiy Civil
e887b03e5a
Merge pull request #1696 from gennadiycivil/master
Code transforms changes, renames.
2018-08-02 23:22:12 -04:00
Gennadiy Civil
2a7077fa24 one more fix 2018-08-02 20:03:26 -07:00
Gennadiy Civil
b929d55704 cmake fixes 2018-08-02 17:46:43 -04:00
Gennadiy Civil
0d29f9702d more fixes 2018-08-02 17:32:43 -04:00
Gennadiy Civil
95c313e685 add --no_stacktrace_support for json-output-unittest 2018-08-02 16:58:11 -04:00
Gennadiy Civil
94f2c6faa7 fixes tests 2018-08-02 16:51:03 -04:00
Gennadiy Civil
677df883ec cmake test fixes 2018-08-02 16:24:09 -04:00
Gennadiy Civil
b7244ff37c cmake fixes 2018-08-02 16:01:00 -04:00
Gennadiy Civil
930f0f86e3 cmake tests changes 2018-08-02 15:45:23 -04:00
Gennadiy Civil
f3511bf1c7 cleaning up and adding test changes to CMake 2018-08-02 14:56:33 -04:00
Gennadiy Civil
bbc0ac9b1a Merge branch 'master' of https://github.com/google/googletest 2018-08-01 17:26:04 -04:00
Gennadiy Civil
5b9b39ff21 Corresponding CMake Changes 2018-08-01 17:25:56 -04:00
Gennadiy Civil
8dea630e88 various changes to tests 2018-08-01 17:06:17 -04:00
Gennadiy Civil
421f527df3 more test changes 2018-08-01 16:23:20 -04:00
Gennadiy Civil
7001dff4fc adding googletest-json-output unitest 2018-08-01 16:12:09 -04:00
Gennadiy Civil
09fc73dde9 more test changes 2018-08-01 15:34:30 -04:00
Gennadiy Civil
96077bc9f3 more tests changes 2018-08-01 15:02:28 -04:00
Gennadiy Civil
b888e23fce googletest list tests unitest 2018-08-01 13:49:29 -04:00
Gennadiy Civil
35aa4fe924 gtest catch exceptions test and gtest shuffle test 2018-08-01 13:32:07 -04:00
Gennadiy Civil
a28968d698 changes to googletest break on failure and googletest filter unittests 2018-08-01 11:46:43 -04:00
Gennadiy Civil
e5e2ef7cd2
Merge pull request #1695 from gennadiycivil/master
Formatting changes and upstreaming one test
2018-08-01 11:45:45 -04:00
Gennadiy Civil
d75922ca1c changes for googletest env var test 2018-08-01 11:35:13 -04:00
Gennadiy Civil
38486eb03e googltest-color-test changes 2018-08-01 11:32:08 -04:00
Gennadiy Civil
6324796be1 googletest-output-test changes 2018-08-01 11:28:24 -04:00
Gennadiy Civil
16c65a476a
Merge branch 'master' into master 2018-08-01 11:09:34 -04:00
Gennadiy Civil
572b07ff8d
Merge pull request #1685 from einsteinsfool/master
Updated broken and outdated URLs
2018-08-01 11:09:18 -04:00
Gennadiy Civil
e69a1a8340 Merge branch 'master' of https://github.com/google/googletest 2018-08-01 11:07:30 -04:00
Gennadiy Civil
539ee4bc54 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
Gennadiy Civil
f978c651ed
Merge branch 'master' into master 2018-07-30 14:01:17 -04:00
Gennadiy Civil
4f160f7370
Merge pull request #1691 from gennadiycivil/master
small tweaks, OSS merge cl 206357486
2018-07-30 13:57:17 -04:00
Gennadiy Civil
012528ccab Merge branch 'master' of https://github.com/google/googletest 2018-07-30 13:35:18 -04:00
Gennadiy Civil
b7cb1bc6f9 small tweaks, OSS merge cl 206357486 2018-07-30 13:31:46 -04:00
Gennadiy Civil
0048647619
Merge pull request #1688 from gennadiycivil/master
Formatting changes for automatic code management
2018-07-27 15:15:11 -04:00
Gennadiy Civil
ec13264af4 added missing comments 2018-07-27 15:05:20 -04:00
Gennadiy Civil
984cba30ed Formatting changes for automatic code management 2018-07-27 11:15:08 -04:00
Piotr Kąkol
309e8a271e Updated broken and outdated URLs 2018-07-25 19:19:26 +02:00
Gennadiy Civil
40904f8970
Merge pull request #1684 from gennadiycivil/master
Formatting changes, code sync
2018-07-25 10:43:26 -04:00
Gennadiy Civil
ed1edf641d Formatting changes, code sync 2018-07-25 10:24:13 -04:00
Gennadiy Civil
78b49242d1
Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp
#1595: fix compiler error with Visual Studio 2017 on Win10 JP.
2018-07-24 10:53:00 -04:00
Gennadiy Civil
a68f0c201d
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-23 15:51:39 -04:00
Gennadiy Civil
82c858b3ad
Merge pull request #1678 from stianval/master
Fixing some formatting in docs/primer
2018-07-23 11:59:29 -04:00
Stian Valle
bb9fc6f66e
Update primer.md 2018-07-21 15:50:45 +02:00
Stian Valle
7abf99d941
Update primer.md 2018-07-21 15:40:57 +02:00
Stian Valle
baf2115a59
Update primer.md 2018-07-21 15:29:58 +02:00
Masaru Tsuchiyama
534570b5bd
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-21 09:18:54 +09:00
Gennadiy Civil
2a151c93c1
Merge pull request #1676 from gennadiycivil/master
code merge
2018-07-20 11:46:26 -04:00
Gennadiy Civil
a02af2f689 code merge 2018-07-20 11:28:58 -04:00
Gennadiy Civil
c62c79432b
Merge pull request #1668 from duxiuxing/googletest_for_asam
Fix warning C4819 in Visual Studio
2018-07-20 10:30:23 -04:00
duxiuxing
d8db0ca9cf
Merge branch 'master' into googletest_for_asam 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
Gennadiy Civil
6ce9b98f54
Merge pull request #1674 from gennadiycivil/master
Code Sync
2018-07-19 13:31:15 -04:00
Gennadiy Civil
61b8197217
Merge branch 'master' into master 2018-07-19 12:54:43 -04:00
Gennadiy Civil
0c17888bcf code sync 2018-07-19 12:42:39 -04:00
duxiuxing
5b19054b02
Merge branch 'master' into googletest_for_asam 2018-07-19 18:38:20 +08:00
Masaru Tsuchiyama
40cd5d1170
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-19 06:51:13 +09:00
Gennadiy Civil
1370e7658b
Merge pull request #1669 from syohex/ignore-ds-store
Ignore .DS_Store file
2018-07-18 14:20:37 -04:00
Gennadiy Civil
a3509a5aa4 Merge branch 'master' of https://github.com/google/googletest 2018-07-18 14:15:58 -04:00
Gennadiy Civil
43163c19d5
Merge branch 'master' into ignore-ds-store 2018-07-18 14:09:06 -04:00
Gennadiy Civil
4235fff7f4
Merge pull request #1671 from gennadiycivil/master
Code merge
2018-07-18 11:54:56 -04:00
Gennadiy Civil
3530ab9e43 Code sync 2018-07-18 11:51:14 -04:00
Gennadiy Civil
d41bfd732f Fix link 2018-07-18 11:38:18 -04:00
Gennadiy Civil
8d07cfd053 Code sync, mostly formatting and removing outdates 2018-07-18 11:30:36 -04:00
Gennadiy Civil
7e73a7ae6e Formatting and a link 2018-07-18 11:17:19 -04:00
Gennadiy Civil
20ef7944a4
Merge pull request #1667 from hckr/patch-1
Fix broken links to FAQ in primer.md
2018-07-18 10:21:46 -04:00
Gennadiy Civil
2211061e64
Merge pull request #1670 from gennadiycivil/master
Docs sync
2018-07-18 10:17:18 -04:00
Masaru Tsuchiyama
234958def5
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-18 08:03:49 +09:00
Gennadiy Civil
4abbb774c3 Merge branch 'master' of https://github.com/google/googletest 2018-07-17 17:47:54 -04:00
Gennadiy Civil
5437926b22 Docs sync 2018-07-17 17:47:25 -04:00
Syohei YOSHIDA
a091b75332 Ignore .DS_Store file 2018-07-17 18:39:29 +09:00
duxiuxing
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 2018-07-17 15:46:47 +08:00
Jakub Młokosiewicz
021c308069
Fix broken links to FAQ in primer.md 2018-07-17 00:49:31 +02:00
Gennadiy Civil
077ee54cef
Merge pull request #1655 from AdrianMoranMontes/master
Fix issue #1654.
2018-07-16 11:17:00 -04:00
Adrian Moran
ee3885fbd6
Merge branch 'master' into master 2018-07-13 12:07:00 +02:00
Adrian Moran
cbd07191f4 Put ifdef guard after the includes.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-13 08:53:03 +02:00
Gennadiy Civil
b4d4438df9
Merge pull request #1653 from derekmauro/stacktrace
Adds stacktrace support from Abseil to Google Test
2018-07-12 17:34:21 -04:00
Derek Mauro
82670da613 Merge branch 'master' into stacktrace 2018-07-12 16:51:04 -04:00