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

55 Commits

Author SHA1 Message Date
Gennadiy Civil
c54f1e884d merging 2018-04-11 15:33:31 -04:00
Gennadiy Civil
41c224c80c Upstream cl/192179348 2018-04-11 15:24:04 -04:00
Gennadiy Civil
797c6f1be1 ..and this should be it 2018-04-11 10:10:24 -04:00
Gennadiy Civil
346f1f5734 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
ec1df5b40f RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 2018-04-10 15:57:16 -04:00
Gennadiy Civil
3f59eb6a59 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil
f9c57f3d48 yet more 2018-04-09 16:04:48 -04:00
Gennadiy Civil
a694e474a3 continued 2018-04-09 09:51:02 -04:00
Gennadiy Civil
a31ca9f2f8 Merge branch 'master' of github.com:google/googletest 2018-04-09 09:29:37 -04:00
Victor Costan
a19ef8a031 Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. 
Commit fe402c2779 published the changes in
internal CL 156157936, but missed the diff in
gmock-generated-nice-strict.h.pump. This makes it difficult to reason
about the change, because the .pump file is more concise than the
generated file.

This PR was tested by re-generating the .h file using the command below
and checking the git diff.

./googletest/scripts/pump.py \
    googlemock/include/gmock/gmock-generated-nice-strict.h.pump
 2018-04-06 17:21:05 -07:00
Gennadiy Civil
fb63da38e7 linkage, fixing MSVC 2018-04-06 16:43:35 -04:00
Gennadiy Civil
fafa60ab77 fixing MSVC 2018-04-06 16:31:11 -04:00
Gennadiy Civil
6573981317 warnings 2018-04-06 11:00:13 -04:00
Gennadiy Civil
1e454bdbcc cont - 2 2018-04-06 10:52:49 -04:00
Gennadiy Civil
907d5d1a7a cont 2018-04-06 10:43:11 -04:00
Gennadiy Civil
55451e85bb more warnings 2018-04-06 10:35:09 -04:00
Gennadiy Civil
a603ff235a deal with MSVC warn, cont 1 2018-04-06 10:24:49 -04:00
Gennadiy Civil
aa397015ee Cont. deal with MCVS warnings 2018-04-06 10:15:00 -04:00
Gennadiy Civil
cb430d1205 Deal with MCVS warnings 2018-04-06 10:01:40 -04:00
Gennadiy Civil
7857d8da7a merging gmock-actions 2 2018-04-06 09:50:01 -04:00
Gennadiy Civil
f906f8446e Merging gMock, 2 2018-04-05 16:09:17 -04:00
Gennadiy Civil
2c7d681681 formatting 2018-04-05 14:41:16 -04:00
Gennadiy Civil
72faea54fd And more MCVS warnings 2018-04-05 14:24:12 -04:00
Gennadiy Civil
a777f64f67 fixing MCVS warn 2018-04-05 14:00:14 -04:00
Gennadiy Civil
bd0ae14317 merging gmock matchers 1 2018-04-04 14:05:00 -04:00
Gennadiy Civil
7c7ab001c1 merging gmock-matchers.h 3 2018-03-26 10:36:26 -04:00
Gennadiy Civil
0eff246cb1 merging gmock-matchers.h 2 2018-03-26 10:16:59 -04:00
Gennadiy Civil
20d30a8614 Upstreaming FloatingEq2Matcher, 2018-03-26 09:28:16 -04:00
Gennadiy Civil
401b056442 Merging gmock-matchers.h -2 2018-03-23 11:42:41 -04:00
Gennadiy Civil
c4727169c2 gmock-matchers merging -2 2018-03-23 11:23:54 -04:00
Gennadiy Civil
7b1726ef5c merging, gmock -1 2018-03-22 15:35:37 -04:00
Gennadiy Civil
92be48af66 More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Gennadiy Civil
0a27876dd3 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil
78797f38ef Merges-1 2018-03-05 12:26:15 -05:00
Gennadiy Civil
6e32061e10 Merge branch 'master' into unsigned-wchar 2018-03-01 11:18:17 -05:00
Xiaoyi Zhang
94075ff9c0 Merge branch 'master' into variant_matcher 2018-02-27 16:03:36 -05:00
Gennadiy Civil
bcc0a1afa1 gmock merging -2 2018-02-27 13:51:09 -05:00
Xiaoyi Zhang
fe8a4bec1b Add matcher for std::variant. 2018-02-27 11:36:21 -05:00
Scott Graham
7c60f81b22 Try to handle unsigned wchar_t (arm) a bit better 2018-02-23 12:28:09 -08:00
Gennadiy Civil
d40efb1166 moving JoinAsTuple to internal 2018-02-12 16:42:12 -05:00
Troy Holsapple
a2866dfdf5 Fixed typos 2018-02-07 22:06:00 -08:00
Gennadiy Civil
05c81235a1 Code merges 2018-01-26 11:57:58 -05:00
David Benjamin
57561c06f0 Pass the -Wmissing-declarations warning. 
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
 2018-01-03 14:50:22 -05:00
Romain Geissler
56088debda Remove gcc 6 misleading indentations. 2017-10-25 17:53:01 +02:00
Jonathan Wakely
c61e22b1fe Use gender-neutral pronouns in comments and docs 2017-09-27 13:31:13 +01:00
Herbert Thielen
b34d59baf1 change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
Alyssa Wilk
6a0c4aab6d Merge branch 'refs/heads/master' into flag-default 2017-08-28 16:10:12 -04:00
Roman Perepelitsa
75a9eed0f5 Support ref-qualified member functions in Property(). 2017-08-22 16:06:26 +02:00
Alyssa Wilk
10232c3adb Adding a flag option to change the default mock type 2017-08-10 09:41:09 -04:00
Gennadiy Civil
fdab6ef84e Merge pull request #1123 from chromy/upstream-141765019 
Fix typo in gmock-actions.h
 2017-08-08 16:17:52 -04:00