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

308 Commits

Author SHA1 Message Date
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
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
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
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
Gennadiy Civil
323fd375e0 testing 2018-04-19 10:19:59 -04:00
David Sunderland
5fd3984f10 Fix friend declaration to use GTEST_API_ decl spec. 2018-04-19 01:11:50 -04:00
David Sunderland
b490cb0400 Revert useless use of GTEST_API_ on WithoutMatchers decl. 2018-04-19 01:10:22 -04:00
David Sunderland
158783e097 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC? 2018-04-18 20:59:49 -04:00
David Sunderland
c24086c099 Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. 2018-04-18 20:25:31 -04:00
David Sunderland
2d4d2d21e7 Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless 2018-04-18 19:39:39 -04:00
David Sunderland
71dcdcc07c Don't use generalized initializer list; is C++11 extension. 2018-04-18 19:37:33 -04:00
dnsunderland
e7ef46473f Merge branch 'master' into parameterless 2018-04-18 16:32:31 -07:00
David Sunderland
cf7b25961a Clone of unsubmitted cr/176529515. Introduce parameterless expectations. 2018-04-18 19:28:56 -04:00
Gennadiy Civil
37373005b6 more typos 2018-04-18 17:13:23 -04:00
Gennadiy Civil
55fa39c914 msvc 2018-04-18 17:03:42 -04:00
Gennadiy Civil
c9801eb77b more typos 2018-04-18 16:43:11 -04:00
Gennadiy Civil
eeecead60a typo 2018-04-18 15:18:03 -04:00
Gennadiy Civil
2c8a469f0e move only types docs 2018-04-18 15:10:07 -04:00
Gennadiy Civil
dd7a276055 typo 2018-04-18 15:02:47 -04:00
Gennadiy Civil
8181a6a9ee typo 2018-04-18 14:25:58 -04:00
Gennadiy Civil
b804421c33 http://cl/193386206 2018-04-18 14:21:28 -04:00
Gennadiy Civil
789434c3fd merge, explicit, ( should be it) 2018-04-18 11:05:00 -04:00
Gennadiy Civil
609802ef23 193353312 2018-04-18 10:36:12 -04:00
Gennadiy Civil
cdc2f4b725 cl/193060888 2018-04-17 19:32:15 -04:00
Gennadiy Civil
7690cb75a0 http://cl/193060888 2018-04-17 16:22:35 -04:00
Gennadiy Civil
4308455071 http://cl/193060888 2018-04-17 16:12:04 -04:00
Gennadiy Civil
43341314bd test-meerging 2018-04-16 15:52:47 -04:00
Gennadiy Civil
cc258bb44d typo 2018-04-16 12:00:37 -04:00
Gennadiy Civil
9290af3a03 more msvc 2018-04-16 11:52:22 -04:00
Gennadiy Civil
47e8442193 typo 2018-04-16 11:41:36 -04:00
Gennadiy Civil
532cd75c14 msvc warnings 2018-04-16 11:32:16 -04:00