zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,148 Commits 10 Branches 30 Tags
b8a92f7c86e4bb686bc47bef6dba418b3588e964
Commit Graph
222 Commits
Author SHA1 Message Date
Gennadiy Civil 0c17888bcf code sync 2018-07-19 12:42:39 -04:00
duxiuxing 5b19054b02 Merge branch 'master' into googletest_for_asam 2018-07-19 18:38:20 +08:00
Masaru Tsuchiyama 40cd5d1170 Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp 2018-07-19 06:51:13 +09:00
Gennadiy Civil 7e73a7ae6e Formatting and a link 2018-07-18 11:17:19 -04:00
duxiuxing 65a49a73f0 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
Masaru Tsuchiyama 4bcc9b9807 This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP. 
non-ASCII charactors are interpreted as Shift-JIS on the environment.
But the charators in the files are non Shift-JIS charactors and the compiler
stops compiling with C4819.

To fix the errors, remove non-ASCII charactors.
 2018-06-30 21:46:41 +09:00
Scott Graham a9653c401e 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 b539167cf0 merging, 2018-04-25 13:10:41 -04:00
Gennadiy Civil 4707c0ffd4 193353312 2018-04-18 10:36:12 -04:00
Gennadiy Civil dff32aff97 http://cl/193060888 2018-04-17 16:12:04 -04:00
Gennadiy Civil 3f88bb1831 test-meerging 2018-04-16 15:52:47 -04:00
Gennadiy Civil bd2a1aed03 merging gmock generated matchers 2018-04-16 11:18:49 -04:00
Gennadiy Civil a79851f2c2 merging 2018-04-12 14:00:38 -04:00
Gennadiy Civil fa658e0cc0 merging 2018-04-12 13:42:47 -04:00
Gennadiy Civil 07f3bdd4c9 Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:13:38 -04:00
Gennadiy Civil e77deb29a6 small cleanup 2018-04-12 09:12:02 -04:00
Victor Costan 1324e2d706 Remove multiple inheritance from "unintesting call" mock classes. 
Internal CL 156157936, which was published in commit
fe402c2779, introduced undefined behavior
by casting a base class (internal::{Naggy,Nice,Strict}Base<MockClass>,
using the curiously recurring template pattern) pointer to a derived
class ({Naggy,Nice,Strict}Mock<MockClass>), in the base class'
constructor. At that point, the object isn't guaranteed to have taken on
the shape of the derived class, and casting is undefined behavior.

The undefined behavior was caught by Chrome's CFI build bot [1], and
prevents rolling googletest past that commit / CL.

This commit simplifies the {Naggy,Nice,Strict}Mock class hierarchy in
a way that removes the undefined behavior.

[1] https://www.chromium.org/developers/testing/control-flow-integrity
 2018-04-12 00:48:30 -07:00
Gennadiy Civil 8654c1ca10 merging 2018-04-11 15:33:31 -04:00
Gennadiy Civil ab84d14281 Upstream cl/192179348 2018-04-11 15:24:04 -04:00
Gennadiy Civil 5cd213ea5e ..and this should be it 2018-04-11 10:10:24 -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 ca54b67303 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil f5871009e6 yet more 2018-04-09 16:04:48 -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
Victor Costan 51f8ad47df 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 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
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 88fc7d7552 merging gmock-actions 2 2018-04-06 09:50:01 -04:00
Gennadiy Civil fe402c2779 Merging gMock, 2 2018-04-05 16:09:17 -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 e55089ec11 merging gmock matchers 1 2018-04-04 14:05:00 -04:00
Gennadiy Civil 6aae206bc2 merging gmock-matchers.h 3 2018-03-26 10:36:26 -04:00
Gennadiy Civil 23187058e7 merging gmock-matchers.h 2 2018-03-26 10:16:59 -04:00
Gennadiy Civil 8ea10d3878 Upstreaming FloatingEq2Matcher, 2018-03-26 09:28:16 -04:00
Gennadiy Civil b907c26740 Merging gmock-matchers.h -2 2018-03-23 11:42:41 -04:00
Gennadiy Civil 466a49ae30 gmock-matchers merging -2 2018-03-23 11:23:54 -04:00
Gennadiy Civil b7c568326c merging, gmock -1 2018-03-22 15:35:37 -04:00
Gennadiy Civil af463c43ac More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Gennadiy Civil a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00