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

335 Commits

Author SHA1 Message Date
Gennadiy Civil
5b38636cb1 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 14:25:05 -07:00
Gennadiy Civil
ea90e723e0 more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil
1564048f79 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 12:55:13 -07:00
Gennadiy Civil
d2e8f7c999 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil
f0bcc9b875 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
175032a9e8 Code formatting changes, clean up, no functionality changes 2018-08-14 11:08:35 -04:00
Gennadiy Civil
b0f2daec87 formatting custom/README.md 2018-08-13 22:45:53 -04:00
Gennadiy Civil
5bdf9c5f70 formatting for new READMEs 2018-08-13 16:23:17 -04:00
Elias Daler
5d4126e1c4 Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717) 2018-08-13 23:01:09 +03:00
Gennadiy Civil
14e8a3161d Move instructions into custom/README files 2018-08-13 14:31:56 -04:00
Gennadiy Civil
d61ffe1c3f comment cleanup 2018-08-13 13:17:38 -04:00
Gennadiy Civil
97eced2f22 Update gmock_output_test.py 2018-08-09 15:24:43 -04:00
Gennadiy Civil
509653b8f6 Formatting change for auto code management, no functionality changes 
Merge branch 'master' of https://github.com/google/googletest
 2018-08-09 10:51:49 -04:00
Gennadiy Civil
c59e574e3f Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
Gennadiy Civil
7fd9b32610 small cleanup, np functional changes 2018-08-07 10:38:41 -04:00
Gennadiy Civil
4747aa2321 automatic code sync mgt, comment only 2018-08-06 15:40:21 -04:00
Gennadiy Civil
4a0b628d2a Merge branch 'master' into master 2018-08-01 11:09:34 -04:00
Gennadiy Civil
b9f30b8d67 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
Gennadiy Civil
4cd6829191 Merge branch 'master' into master 2018-07-30 14:01:17 -04:00
Gennadiy Civil
821944fa56 Formatting changes for automatic code management 2018-07-27 11:15:08 -04:00
Piotr Kąkol
65e7d50e3e Updated broken and outdated URLs 2018-07-25 19:19:26 +02:00
Gennadiy Civil
c0f448fde4 Formatting changes, code sync 2018-07-25 10:24:13 -04: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
68683d415c code merge 2018-07-20 11:28:58 -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
21a1dae1b5 code sync 2018-07-19 12:42:39 -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
c38120ec6f Code sync 2018-07-18 11:51:14 -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
Masaru Tsuchiyama
fcf94e7a42 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-18 08:03:49 +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
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
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
Adrian Moran
5cad1bb286 Fix issue #1654. 
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
 2018-07-11 14:59:01 +02:00
Masaru Tsuchiyama
42ada6cebb This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP. 
non-ASCII charactors are interpreted as Shift-JIS on the environment.
But the charators in the files are non Shift-JIS charactors and the compiler
stops compiling with C4819.

To fix the errors, remove non-ASCII charactors.
 2018-06-30 21:46:41 +09:00
Gennadiy Civil
b9d9de0877 Removed "Documentation.md" not adding value and not consitent with internal docs 2018-06-11 12:07:45 -04:00
Gennadiy Civil
e76e9b4789 Rename AdvancedGuide.md to advanced.md and adjust the links. 
Part of documentation rationalization work
 2018-06-11 11:40:35 -04:00
Gennadiy Civil
79abc0695c Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion rationalzation 2018-06-11 11:26:16 -04:00
Gennadiy Civil
3bde81a48b formatting changes 2018-05-23 11:49:11 -04:00
Gennadiy Civil
5bf664a82c Formatting changes 2018-05-23 11:03:31 -04:00
Scott Graham
7550a4c571 Fix gmock not building when -fno-rtti 
Fixes issue #1554. This is internal cl/195020996.
 2018-05-02 11:14:39 -07:00
Gennadiy Civil
63e8124d63 merged 2018-04-25 13:16:19 -04:00
Gennadiy Civil
edaeb8bc88 merging, 2018-04-25 13:10:41 -04:00
Gennadiy Civil
179c305b03 Merge branch 'master' into parameterless 2018-04-19 18:35:17 -04:00
Gennadiy Civil
8c56e0c06f reverting, test 2018-04-19 11:28:46 -04:00
Gennadiy Civil
2b790c5f24 reverting just to test 2018-04-19 11:14:17 -04:00