3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-21 15:11:57 +08:00
Code Issues Projects Releases Wiki Activity
3,033 Commits 7 Branches 27 Tags 40 MiB
Commit Graph

3033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
fdb57f8571
Merge pull request #1561 from gennadiycivil/master 
Merging gmock-actions
 2018-04-11 16:06:23 -04:00
Gennadiy Civil
373481c5a9 ...merging 2018-04-11 15:46:57 -04:00
Gennadiy Civil
ef17a9f98a Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:38:25 -04:00
Gennadiy Civil
6273647250
Merge pull request #1560 from gennadiycivil/master 
Upstream cl/192179348
 2018-04-11 15:38:15 -04:00
Gennadiy Civil
8654c1ca10 merging 2018-04-11 15:33:31 -04:00
Gennadiy Civil
af4cfd5088 Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:24:25 -04:00
Gennadiy Civil
ab84d14281 Upstream cl/192179348 2018-04-11 15:24:04 -04:00
Gennadiy Civil
b4429c9219
Merge pull request #1559 from gennadiycivil/master 
Upstream cl 191754725
 2018-04-11 13:57:33 -04:00
Gennadiy Civil
106e731e68 Merge branch 'master' of https://github.com/google/googletest 2018-04-11 13:20:55 -04:00
Gennadiy Civil
c13ab6003b merging 2018-04-11 13:20:36 -04:00
Gennadiy Civil
d5988e7dd0
Merge pull request #1558 from gennadiycivil/master 
RE-Doing the merge, this time with gcc on mac in the PR
 2018-04-11 10:22:10 -04:00
Gennadiy Civil
5cd213ea5e ..and this should be it 2018-04-11 10:10:24 -04:00
Gennadiy Civil
6a7573a7de more 2018-04-11 09:55:36 -04:00
Gennadiy Civil
039d9b54c2 pizza work, cont 2018-04-11 09:47:38 -04:00
Gennadiy Civil
f15fd9610b osx pizzas, cont 2018-04-11 09:33:51 -04:00
Gennadiy Civil
b15be9a819 fixing osx pizza 2018-04-11 09:20:48 -04:00
Gennadiy Civil
6f9db26159 merging 2018-04-10 16:34:21 -04:00
Gennadiy Civil
9bc82ce725 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil
25d8176e4f merging 2018-04-10 16:18:23 -04:00
Gennadiy Civil
39c58da187 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
e1071eb949 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
8fbb419470
Include gcc on mac into PR matrix 
There was an error that slipped through and only showed up on PR merge (https://travis-ci.org/google/googletest/jobs/364304396/config ) , we dont want that again
 2018-04-10 11:28:16 -04:00
Gennadiy Civil
a072611118
Merge pull request #1556 from google/revert-1551-master 
Revert "gmock actions 2"
 2018-04-09 22:37:50 -04:00
Gennadiy Civil
ca54b67303
Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil
7f03f7ceae
Merge pull request #1551 from gennadiycivil/master 
gmock actions 2
 2018-04-09 16:34:54 -04:00
Gennadiy Civil
64d24b810f ... and this 2018-04-09 16:24:30 -04:00
Gennadiy Civil
c1d4c34233 this should be it 2018-04-09 16:13:45 -04:00
Gennadiy Civil
f5871009e6 yet more 2018-04-09 16:04:48 -04:00
Gennadiy Civil
05b5a53898 formatting 2018-04-09 15:50:19 -04:00
Gennadiy Civil
2de24fbf7a tuning 2018-04-09 15:39:12 -04:00
Gennadiy Civil
055f32199a tuning 2018-04-09 15:38:38 -04:00
Gennadiy Civil
57d6e824b4 more 2018-04-09 15:33:56 -04:00
Gennadiy Civil
44da2b9ac5 cont 2018-04-09 15:23:00 -04:00
Gennadiy Civil
e93a0ece26 msvc 2018-04-09 13:51:01 -04:00
Gennadiy Civil
c4684b49cf more msvc 2018-04-09 12:03:40 -04:00
Gennadiy Civil
431bfdcaf4 msvc 14 2018-04-09 11:48:02 -04:00
Gennadiy Civil
8bc7c631e8 testing msvc again 2018-04-09 11:35:01 -04:00
Gennadiy Civil
c4e3d77ddc More msvc 14 2018-04-09 11:22:11 -04:00
Gennadiy Civil
6525044ce2 And also silence for MSVS14 2018-04-09 10:51:15 -04:00
Gennadiy Civil
35a709a701 preproc syntax ( I can never remember it) 2018-04-09 10:25:59 -04:00
Gennadiy Civil
61e8a0b10b syntax 2018-04-09 10:08:12 -04:00
Gennadiy Civil
03be5df17c cont. 2018-04-09 09:59:09 -04:00
Gennadiy Civil
e0b3c269c2 continued 2018-04-09 09:51:02 -04:00
Gennadiy Civil
d0de1180e4 Merge branch 'master' of github.com:google/googletest 2018-04-09 09:29:37 -04:00
Gennadiy Civil
7529698fa3
Merge pull request #1552 from pwnall/mock-pump 
Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h
 2018-04-09 09:28:35 -04:00
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
dbd206e3d9 more mcvs fixing 2018-04-06 16:55:46 -04:00
Gennadiy Civil
701e1e5dc1 linkage, fixing MSVC 2018-04-06 16:43:35 -04:00
Gennadiy Civil
2d4d4ef739 fixing MSVC 2018-04-06 16:31:11 -04:00
Henry Schreiner
4b6a7a49ab
Merge branch 'master' into cleanup-cmake 2018-04-06 21:52:42 +02:00
Gennadiy Civil
5fe8de5ded more warnings 2018-04-06 11:40:04 -04:00
Gennadiy Civil
cb13dc759c more warnings 2018-04-06 11:26:12 -04:00
Gennadiy Civil
d9f3611a22 more MSVC warnings 2018-04-06 11:17:45 -04:00
Gennadiy Civil
c75b76e20a warnings 2018-04-06 11:00:13 -04:00
Gennadiy Civil
04e31881fc cont - 2 2018-04-06 10:52:49 -04:00
Gennadiy Civil
32ac949254 cont 2018-04-06 10:43:11 -04:00
Gennadiy Civil
1831ac9361 more warnings 2018-04-06 10:35:09 -04:00
Gennadiy Civil
eb3e4aac2e deal with MSVC warn, cont 1 2018-04-06 10:24:49 -04:00
Gennadiy Civil
50c0bcd7e3 Cont. deal with MCVS warnings 2018-04-06 10:15:00 -04:00
Gennadiy Civil
b5c87fbcb6 Deal with MCVS warnings 2018-04-06 10:01:40 -04:00
Gennadiy Civil
427b6a297f Merge branch 'master' of github.com:google/googletest 2018-04-06 09:50:14 -04:00
Gennadiy Civil
88fc7d7552 merging gmock-actions 2 2018-04-06 09:50:01 -04: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
Henry Fredrick Schreiner
b22e8dec40 Clean up cache non-advanced variable for subproject 2018-04-05 13:40:26 +02: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