eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,986 Commits 13 Branches 14 Tags
Commit Graph

2986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
06bcde187c Merge pull request #1684 from gennadiycivil/master 
Formatting changes, code sync
 2018-07-25 10:43:26 -04:00
Gennadiy Civil
c0f448fde4 Formatting changes, code sync 2018-07-25 10:24:13 -04:00
Gennadiy Civil
6fb75e2fbe 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
698aa12437 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-23 15:51:39 -04:00
Gennadiy Civil
93e29fc2a3 Merge pull request #1678 from stianval/master 
Fixing some formatting in docs/primer
 2018-07-23 11:59:29 -04:00
tisi1988
18179ea5bf Merge branch 'master' into master 2018-07-23 10:10:26 +02:00
Stian Valle
fcd6742ad3 Update primer.md 2018-07-21 15:50:45 +02:00
Stian Valle
b3acd3671f Update primer.md 2018-07-21 15:40:57 +02:00
Stian Valle
faa7d62f6d Update primer.md 2018-07-21 15:29:58 +02:00
Masaru Tsuchiyama
e66a217d86 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-21 09:18:54 +09:00
Gennadiy Civil
bded1ac252 Merge branch 'master' into deprecate 2018-07-20 15:53:16 -04:00
Gennadiy Civil
796af59a5a Merge pull request #1676 from gennadiycivil/master 
code merge
 2018-07-20 11:46:26 -04:00
Gennadiy Civil
68683d415c code merge 2018-07-20 11:28:58 -04:00
Gennadiy Civil
425453bc31 Merge pull request #1668 from duxiuxing/googletest_for_asam 
Fix warning C4819 in Visual Studio
 2018-07-20 10:30:23 -04:00
duxiuxing
77088fa137 Merge branch 'master' into googletest_for_asam 2018-07-20 06:16:21 +08:00
杜修杏
617d1fd14a Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio 2018-07-20 06:15:13 +08:00
Gennadiy Civil
4296aedadd Merge pull request #1674 from gennadiycivil/master 
Code Sync
 2018-07-19 13:31:15 -04:00
Gennadiy Civil
33e8cabd04 Merge branch 'master' into master 2018-07-19 12:54:43 -04:00
Gennadiy Civil
21a1dae1b5 code sync 2018-07-19 12:42:39 -04:00
Gennadiy Civil
1adf96fefb Merge branch 'master' into deprecate 2018-07-19 11:07:10 -04:00
duxiuxing
20f9427c4a Merge branch 'master' into googletest_for_asam 2018-07-19 18:38:20 +08:00
Masaru Tsuchiyama
f2ddc0edd2 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-19 06:51:13 +09:00
Gennadiy Civil
e75dd8963a Merge pull request #1669 from syohex/ignore-ds-store 
Ignore .DS_Store file
 2018-07-18 14:20:37 -04:00
Gennadiy Civil
d3a226b45f Merge branch 'master' of https://github.com/google/googletest 2018-07-18 14:15:58 -04:00
Gennadiy Civil
c6aadf7a13 Merge branch 'master' into ignore-ds-store 2018-07-18 14:09:06 -04:00
Gennadiy Civil
a355b887e6 Merge pull request #1671 from gennadiycivil/master 
Code merge
 2018-07-18 11:54:56 -04:00
Gennadiy Civil
c38120ec6f Code sync 2018-07-18 11:51:14 -04:00
Gennadiy Civil
135311b866 Fix link 2018-07-18 11:38:18 -04:00
Gennadiy Civil
db4c08167d Code sync, mostly formatting and removing outdates 2018-07-18 11:30:36 -04:00
Gennadiy Civil
974129ca2a Formatting and a link 2018-07-18 11:17:19 -04:00
Gennadiy Civil
6d6695fd8d 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
9e245b6139 Merge pull request #1670 from gennadiycivil/master 
Docs sync
 2018-07-18 10:17:18 -04:00
Masaru Tsuchiyama
fcf94e7a42 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-18 08:03:49 +09:00
Gennadiy Civil
f022427c9d Merge branch 'master' of https://github.com/google/googletest 2018-07-17 17:47:54 -04:00
Gennadiy Civil
b4f8d06ba6 Docs sync 2018-07-17 17:47:25 -04:00
Syohei YOSHIDA
c06a50ee3b Ignore .DS_Store file 2018-07-17 18:39:29 +09:00
duxiuxing
9e02b51c70 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
3234ab691f Fix broken links to FAQ in primer.md 2018-07-17 00:49:31 +02:00
Gennadiy Civil
f1b50e729d Merge branch 'master' into deprecate 2018-07-16 11:17:46 -04:00
Gennadiy Civil
744c161d38 Merge pull request #1655 from AdrianMoranMontes/master 
Fix issue #1654.
 2018-07-16 11:17:00 -04:00
Loo Rong Jie
3e978aa4bc Disable MSVC function deprecation when using Clang 2018-07-13 21:23:28 +08:00
Adrian Moran
3098bed7b7 Merge branch 'master' into master 2018-07-13 12:07:00 +02:00
Adrian Moran
e7e574767d Put ifdef guard after the includes. 
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
 2018-07-13 08:53:03 +02:00
Gennadiy Civil
fb46a3f9d4 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
7365cccdb2 Merge branch 'master' into stacktrace 2018-07-12 16:51:04 -04:00
Gennadiy Civil
8a41d32aef Merge pull request #1662 from derekmauro/variant 
Adds the UniversalPrinter for absl::variant.
 2018-07-12 15:51:13 -04:00
Derek Mauro
d3ad5a86ec Adds the UniversalPrinter for absl::variant. 2018-07-12 13:46:50 -04:00
Adrian Moran
0201c9ddde Avoid full test in no exceptions are enabled. 
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
 2018-07-12 15:10:08 +02:00
tisi1988
4604172e18 Merge branch 'master' into master 2018-07-12 11:06:08 +02:00
Wojciech Kaluza
38a74ebce3 Remove default /EHsc compiler flag 
This prevents warning D9025 (one command-line option overrides
another) on MSVC builds: some test targets are built with
the /EHs-c- which conflicts with /EHsc.
 2018-07-11 22:54:05 +01:00