generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,751 Commits 1 Branch 15 Tags
Commit Graph

1751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Costan
51f8ad47df Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. 
Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 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
82febb8eaf
Merge pull request #1549 from gennadiycivil/master 
Merging gMock, 2
 2018-04-05 16:20:18 -04:00
Gennadiy Civil
bee1d13fcc Merge branch 'master' of github.com:google/googletest 2018-04-05 16:09:31 -04:00
Gennadiy Civil
fe402c2779 Merging gMock, 2 2018-04-05 16:09:17 -04:00
Gennadiy Civil
d0905653ed
Merge pull request #1547 from gennadiycivil/master 
Matchers testing
 2018-04-05 14:53:02 -04:00
Gennadiy Civil
7e5f90d378 formatting 2018-04-05 14:41:16 -04:00
Gennadiy Civil
928636135b And more MCVS warnings 2018-04-05 14:24:12 -04:00
Gennadiy Civil
e0f4cf0561 fixing MCVS warn 2018-04-05 14:00:14 -04:00
Gennadiy Civil
7045138a0d Have to wait for this one 2018-04-05 11:59:59 -04:00
Gennadiy Civil
66eaf9f0eb Have to wait for this one 2018-04-05 11:55:25 -04:00
Gennadiy Civil
af93d59eb7 Merging matchers test 2018-04-05 11:35:20 -04:00
Gennadiy Civil
47d15bceea Merge branch 'master' of github.com:google/googletest 2018-04-05 11:34:32 -04:00
Gennadiy Civil
0cd6a4f5f5 Merging matchers test 2018-04-05 11:34:19 -04:00
Gennadiy Civil
2cf2a1f8ce
Merge pull request #1545 from gennadiycivil/master 
merging gmock matchers 1
 2018-04-04 16:14:41 -04:00
Gennadiy Civil
f7098a2a4d
Merge branch 'master' into master 2018-04-04 16:01:44 -04:00
Gennadiy Civil
d81b6a0c4c bad cut/paste 2018-04-04 15:46:04 -04:00
Gennadiy Civil
a608d4a362 More on MSVC warning C4503, decorated name length exceeded 2018-04-04 15:44:27 -04:00
Gennadiy Civil
6f4e93943a More on MSVC warning C4503, decorated name length exceeded 2018-04-04 15:29:05 -04:00
Gennadiy Civil
5b3d27729b Address MSVC warning C4503, decorated name length exceeded, name was truncated 2018-04-04 15:07:52 -04:00
Gennadiy Civil
aa14cc4285 Fixing build break on MSVC 2018-04-04 14:48:06 -04:00
Gennadiy Civil
891e436c6c
Merge pull request #1543 from fo40225/fix_locale_win 
fix build break on locale windows
 2018-04-04 14:28:11 -04:00
Gennadiy Civil
0f790fa5a8 Merge branch 'master' of github.com:google/googletest 2018-04-04 14:05:15 -04:00
Gennadiy Civil
e55089ec11 merging gmock matchers 1 2018-04-04 14:05:00 -04:00
Gennadiy Civil
fbe3c94533
Merge branch 'master' into fix_locale_win 2018-04-04 13:58:55 -04:00
Gennadiy Civil
4377699066
Merge pull request #1542 from gennadiycivil/master 
Tweaking #1523 to exclude nacl, cl 191591810
 2018-04-04 11:35:28 -04:00
fo40225
a0c27bd8a5 fix build break on locale windows 2018-04-04 23:16:16 +08:00
Gennadiy Civil
1776ed8c1e Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl 2018-04-04 11:06:09 -04:00
Gennadiy Civil
07af8af373
Merge pull request #1523 from leissa/int3 
provide alternative for DebugBreak()
 2018-04-04 10:51:46 -04:00
Gennadiy Civil
98687b7847
Merge branch 'master' into int3 2018-04-03 16:31:59 -04:00
Gennadiy Civil
7d955430d1
Merge pull request #1541 from gennadiycivil/master 
Upstream, 191344765
 2018-04-03 16:28:53 -04:00
Gennadiy Civil
18be012457
Merge branch 'master' into int3 2018-04-03 16:27:32 -04:00
Gennadiy Civil
75ea13deb2 Merge branch 'master' of github.com:google/googletest 2018-04-03 16:15:16 -04:00
Gennadiy Civil
d52aaee8eb Upstreaming, cl 191344765 2018-04-03 16:14:35 -04:00
Gennadiy Civil
ac783bd787
Merge pull request #1539 from gennadiycivil/master 
merging port, continue
 2018-04-03 15:26:44 -04:00
Gennadiy Civil
27507429cb
Merge branch 'master' into int3 2018-04-03 11:44:23 -04:00
Gennadiy Civil
a2dd136578 merging port, cont. 191443078 2018-04-03 11:38:30 -04:00
Gennadiy Civil
1065591bdb Merge branch 'master' of github.com:google/googletest 2018-04-03 11:24:45 -04:00
Gennadiy Civil
aa349acb07 merging, cont - 2 2018-04-03 11:23:54 -04:00
Gennadiy Civil
6c9d07f112
Merge pull request #1538 from gennadiycivil/master 
merging , cont
 2018-04-03 11:18:56 -04:00
Gennadiy Civil
6abaa2467b Merge branch 'master' of github.com:google/googletest 2018-04-03 11:06:34 -04:00
Gennadiy Civil
2cedd5b9c1 merging gtest-port.h , 191439094 2018-04-03 11:06:20 -04:00
Gennadiy Civil
653a435f99
Merge pull request #1537 from gennadiycivil/master 
gtest-port.h merge
 2018-04-03 10:09:08 -04:00
Gennadiy Civil
04d1e56bd2 merging, just comments format 2018-04-03 09:56:23 -04:00
Gennadiy Civil
5beb452bbe testing, merge 2018-04-03 09:45:49 -04:00
Gennadiy Civil
b8cbd53e02 Merge branch 'master' of github.com:google/googletest 2018-04-03 09:31:49 -04:00
Gennadiy Civil
df5a48da03 Testing, gtest-port.h merge 2018-04-03 09:31:10 -04:00
Gennadiy Civil
9df719da8d
Merge pull request #1534 from gennadiycivil/master 
merging gtest-port.h, again - 1
 2018-04-02 16:03:22 -04:00
Gennadiy Civil
87a4cdddd0 merging gtest-port.h, again - 1 2018-04-02 14:22:24 -04:00
Roland Leißa
b1d18b85bd
Merge branch 'master' into int3 2018-03-30 03:16:20 +02:00
Gennadiy Civil
7888184f28
Include OSX builds back into PR builds 
Had an instance where the breakage was not detected until the actual merge. Need to be better than that
 2018-03-29 13:50:32 -04:00