Commit Graph

2140 Commits

Author SHA1 Message Date
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
tisi1988
25e1436b08
Merge branch 'master' into master 2018-08-01 12:11:18 +02:00
Gennadiy Civil
6269264dfe
Merge branch 'master' into deprecate 2018-07-30 16:11:06 -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
Gennadiy Civil
6cacb41935
Merge branch 'master' into deprecate 2018-07-26 13:04:53 -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
tisi1988
1ae4fdb790
Merge branch 'master' into master 2018-07-23 10:10:26 +02: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
fd4f7cc729
Merge branch 'master' into deprecate 2018-07-20 15:53:16 -04: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
Gennadiy Civil
1f9c668a04
Merge branch 'master' into deprecate 2018-07-19 11:07:10 -04:00
duxiuxing
5b19054b02
Merge branch 'master' into googletest_for_asam 2018-07-19 18:38:20 +08:00