Gennadiy Civil
1a8e789fc4
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
a19ef8a031
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
88c1049450
Merge pull request #1549 from gennadiycivil/master
...
Merging gMock, 2
2018-04-05 16:20:18 -04:00
Gennadiy Civil
44d0780446
Merge branch 'master' of github.com:google/googletest
2018-04-05 16:09:31 -04:00
Gennadiy Civil
f906f8446e
Merging gMock, 2
2018-04-05 16:09:17 -04:00
Gennadiy Civil
8a368025d6
Merge pull request #1547 from gennadiycivil/master
...
Matchers testing
2018-04-05 14:53:02 -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
87494ebad5
Have to wait for this one
2018-04-05 11:59:59 -04:00
Gennadiy Civil
22aa2e3632
Have to wait for this one
2018-04-05 11:55:25 -04:00
Gennadiy Civil
0e34a61d3b
Merging matchers test
2018-04-05 11:35:20 -04:00
Gennadiy Civil
93b36c3242
Merge branch 'master' of github.com:google/googletest
2018-04-05 11:34:32 -04:00
Gennadiy Civil
cef7e53700
Merging matchers test
2018-04-05 11:34:19 -04:00
Gennadiy Civil
db27bd21c6
Merge pull request #1545 from gennadiycivil/master
...
merging gmock matchers 1
2018-04-04 16:14:41 -04:00
Gennadiy Civil
069066bd44
Merge branch 'master' into master
2018-04-04 16:01:44 -04:00
Gennadiy Civil
ea3f268c4f
bad cut/paste
2018-04-04 15:46:04 -04:00
Gennadiy Civil
2c88d98934
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:44:27 -04:00
Gennadiy Civil
3e9b148bc1
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:29:05 -04:00
Gennadiy Civil
cfccfa9ca2
Address MSVC warning C4503, decorated name length exceeded, name was truncated
2018-04-04 15:07:52 -04:00
Gennadiy Civil
0452f1fbff
Fixing build break on MSVC
2018-04-04 14:48:06 -04:00
Gennadiy Civil
ca928f3990
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
2b3d17b2ba
Merge branch 'master' of github.com:google/googletest
2018-04-04 14:05:15 -04:00
Gennadiy Civil
bd0ae14317
merging gmock matchers 1
2018-04-04 14:05:00 -04:00
Gennadiy Civil
c02289588b
Merge branch 'master' into fix_locale_win
2018-04-04 13:58:55 -04:00
Gennadiy Civil
65c10f33d9
Merge pull request #1542 from gennadiycivil/master
...
Tweaking #1523 to exclude nacl, cl 191591810
2018-04-04 11:35:28 -04:00
fo40225
be6dfba167
fix build break on locale windows
2018-04-04 23:16:16 +08:00
Gennadiy Civil
a36f3d1e6a
Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
2018-04-04 11:06:09 -04:00
Gennadiy Civil
3b447cdd91
Merge pull request #1523 from leissa/int3
...
provide alternative for DebugBreak()
2018-04-04 10:51:46 -04:00
Gennadiy Civil
34e82f9eb5
Merge branch 'master' into int3
2018-04-03 16:31:59 -04:00
Gennadiy Civil
9fd5a03107
Merge pull request #1541 from gennadiycivil/master
...
Upstream, 191344765
2018-04-03 16:28:53 -04:00
Gennadiy Civil
bd6296d44c
Merge branch 'master' into int3
2018-04-03 16:27:32 -04:00
Gennadiy Civil
d3e1b8ff64
Merge branch 'master' of github.com:google/googletest
2018-04-03 16:15:16 -04:00
Gennadiy Civil
fdc03e450a
Upstreaming, cl 191344765
2018-04-03 16:14:35 -04:00
Gennadiy Civil
52a1decd3b
Merge pull request #1539 from gennadiycivil/master
...
merging port, continue
2018-04-03 15:26:44 -04:00
Gennadiy Civil
06f96276f6
Merge branch 'master' into int3
2018-04-03 11:44:23 -04:00
Gennadiy Civil
f7e1b4f330
merging port, cont. 191443078
2018-04-03 11:38:30 -04:00
Gennadiy Civil
4c2d2065b5
Merge branch 'master' of github.com:google/googletest
2018-04-03 11:24:45 -04:00
Gennadiy Civil
ffcd94d903
merging, cont - 2
2018-04-03 11:23:54 -04:00
Gennadiy Civil
bc16771801
Merge pull request #1538 from gennadiycivil/master
...
merging , cont
2018-04-03 11:18:56 -04:00
Gennadiy Civil
bc8445f91f
Merge branch 'master' of github.com:google/googletest
2018-04-03 11:06:34 -04:00
Gennadiy Civil
5539444c20
merging gtest-port.h , 191439094
2018-04-03 11:06:20 -04:00
Gennadiy Civil
d1ce051947
Merge pull request #1537 from gennadiycivil/master
...
gtest-port.h merge
2018-04-03 10:09:08 -04:00
Gennadiy Civil
4534287cb6
merging, just comments format
2018-04-03 09:56:23 -04:00
Gennadiy Civil
98f4d5db7a
testing, merge
2018-04-03 09:45:49 -04:00
Gennadiy Civil
543e387114
Merge branch 'master' of github.com:google/googletest
2018-04-03 09:31:49 -04:00
Gennadiy Civil
c300e3085b
Testing, gtest-port.h merge
2018-04-03 09:31:10 -04:00
Gennadiy Civil
857d402550
Merge pull request #1534 from gennadiycivil/master
...
merging gtest-port.h, again - 1
2018-04-02 16:03:22 -04:00
Gennadiy Civil
b4d1bd371d
merging gtest-port.h, again - 1
2018-04-02 14:22:24 -04:00
Roland Leißa
8f7e029803
Merge branch 'master' into int3
2018-03-30 03:16:20 +02:00