Commit Graph
100 Commits
Author SHA1 Message Date
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 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 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 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 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 1776ed8c1e Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl 2018-04-04 11:06:09 -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 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 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 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 87a4cdddd0 merging gtest-port.h, again - 1 2018-04-02 14:22:24 -04:00
Gennadiy Civil 8e0364a37b merging gtest-port, 2 2018-03-29 09:46:13 -04:00
Gennadiy Civil aea6fc32aa merging gtest-port 1 of N 2018-03-27 15:19:40 -04:00
Gennadiy Civil a75a5c9706 merges 1 2018-03-26 13:14:00 -04:00
Gennadiy Civil a0e2faf480 Merge branch 'master' of https://github.com/google/googletest 2018-03-26 13:04:34 -04:00
Gennadiy Civil 3df7cbe6f7 merges, gtest 2018-03-26 13:04:28 -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 a28a7eb5e9 Merge branch 'master' of https://github.com/google/googletest 2018-03-22 16:24:51 -04:00
Gennadiy Civil b7c568326c merging, gmock -1 2018-03-22 15:35:37 -04:00
Gennadiy Civil 4e89c76db8 reverting gtest_list_tests_unittest.py 2018-03-22 12:37:38 -04:00
Gennadiy Civil da71e8c870 more merges 2018-03-22 10:58:18 -04:00
Gennadiy Civil 0f6567954f more merges 2018-03-22 10:56:35 -04:00
Gennadiy Civil 691e38e518 More merges 2018-03-21 16:31:31 -04:00
Gennadiy Civil a3c2e107ae cl 189032107, again 2018-03-16 15:56:31 -04:00
Gennadiy Civil 080fcbe0aa cl 189032107 2018-03-16 13:36:36 -04:00
Gennadiy Civil a178cc7ef7 merge, again, IsRecursiveContainer 2018-03-15 14:31:37 -04:00
Gennadiy Civil 262aaf2f1d erging, cont 2018-03-14 10:49:18 -04:00
Gennadiy Civil 2814b4b089 merging, merging 2018-03-13 16:02:05 -04:00
Gennadiy Civil a719320a3c fixing, was removing too much 2018-03-13 11:53:27 -04:00
Gennadiy Civil 5461f63d01 Merge branch 'master' of https://github.com/google/googletest 2018-03-13 11:13:58 -04:00
Gennadiy Civil af463c43ac More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Gennadiy Civil cf9d6344d2 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil e891900666 Merging, XML tests 2018-03-07 15:57:55 -05:00
Gennadiy Civil 89d6f70f34 merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil 995a9dfa69 merges-7 2018-03-05 15:21:48 -05:00
Gennadiy Civil 086825de5d merges-6 2018-03-05 14:21:41 -05:00
Gennadiy Civil 94d78ea14b Merge branch 'master' of https://github.com/google/googletest 2018-03-05 13:59:08 -05:00
Gennadiy Civil 8385928428 merges-3 2018-03-05 13:51:39 -05:00
Gennadiy Civil 73bf41299d Merge branch 'master' of https://github.com/google/googletest 2018-03-05 13:28:17 -05:00
Gennadiy Civil dbf63e38a4 merges-2 2018-03-05 13:28:13 -05:00
Gennadiy Civil a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil 0d5e01ad7b Merges-1 2018-03-05 12:26:15 -05:00
Gennadiy Civil 2bd1750ba7 gmock merging -2 2018-02-27 13:51:09 -05:00
Gennadiy Civil 4dbb437174 merging unittests - 5 2018-02-26 09:51:27 -05:00
Gennadiy Civil 004f6a00b2 merging unitests - check 4 2018-02-23 15:27:11 -05:00
Gennadiy Civil 194c99b942 Merge branch 'master' of https://github.com/google/googletest 2018-02-23 11:51:40 -05:00
Gennadiy Civil 29e9ca8774 merging unitests, check 2018-02-23 11:29:35 -05:00
Gennadiy Civil 3299a2386c merging unittests - 2 2018-02-23 11:07:18 -05:00
Gennadiy Civil b7e0294c51 merging unitests 2018-02-23 10:47:11 -05:00
Gennadiy Civil df65632489 merges 2018-02-22 15:53:14 -05:00
Gennadiy Civil 8248169287 Merge branch 'master' of https://github.com/google/googletest 2018-02-13 15:26:07 -05:00
Gennadiy Civil a3e322b24f cleanup, merges 2018-02-13 15:25:57 -05:00
Gennadiy Civil 68e4f076e5 Merge branch 'master' of https://github.com/google/googletest 2018-02-13 14:56:31 -05:00
Gennadiy Civil 09581b3852 cleanup/merges 2018-02-13 14:56:05 -05:00
Gennadiy Civil 069724197c merging, cleaning up 2018-02-13 14:13:52 -05:00
Gennadiy Civil 64290752e9 Merge branch 'master' of https://github.com/google/googletest 2018-02-13 13:50:52 -05:00
Gennadiy Civil ab186a8c49 merges 2018-02-13 13:49:57 -05:00
Gennadiy Civil 30d276da03 cxxx11 2018-02-13 11:48:32 -05:00
Gennadiy Civil 3b1fe3ec45 clang warnings 2018-02-13 11:24:09 -05:00
Gennadiy Civil d7c966c4de clang warnings 2018-02-13 11:15:03 -05:00
Gennadiy Civil 2a23ca0009 https://travis-ci.org/google/googletest/jobs/340995238 2018-02-13 11:05:01 -05:00
Gennadiy Civil a66d209061 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' 2018-02-13 10:23:42 -05:00
Gennadiy Civil e76f4ee9fd clang warning https://travis-ci.org/google/googletest/jobs/340978022 2018-02-13 10:05:43 -05:00
Gennadiy Civil 9e072812e3 merges 2018-02-13 09:45:12 -05:00
Gennadiy Civil 1a7732a488 Merge branch 'master' of https://github.com/google/googletest 2018-02-12 16:42:43 -05:00