zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,684 Commits 10 Branches 30 Tags
23187058e761c2b0f6b11ecc8b30c949afb8eb01
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gennadiy Civil 225e6741ac moving JoinAsTuple to internal 2018-02-12 16:42:12 -05:00
Gennadiy Civil b94ba27d44 Merge branch 'master' of https://github.com/google/googletest 2018-02-12 14:08:17 -05:00
Gennadiy Civil d84f58ab10 Merging, coniniue 2018-02-12 14:07:45 -05:00
Gennadiy Civil 575c081227 merging 2018-02-09 17:45:10 -05:00
Gennadiy Civil 49fc378e0a merges 2018-02-09 16:02:17 -05:00
Gennadiy Civil ec7faa943d merges 2018-02-09 10:41:09 -05:00
Gennadiy Civil e6ec8bc52f Merges and also adding new bazel build mode 2018-01-31 12:05:18 -05:00
Gennadiy Civil e55fded0c8 Code merges 2018-01-30 17:34:22 -05:00
Gennadiy Civil 2a4683021a Ability to optionally depend on Abseil plus upstream of 183716547 2018-01-30 11:42:03 -05:00
Gennadiy Civil 6c0c389601 Adding tests to googlemock bazel 2018-01-26 16:30:57 -05:00
Gennadiy Civil 92c93802e1 Merge branch 'master' of https://github.com/google/googletest 2018-01-26 11:58:17 -05:00
Gennadiy Civil fbb48a7708 Code merges 2018-01-26 11:57:58 -05:00
Gennadiy Civil b9651c04ef placating gcc and its overzeauls size comparison warnings 2018-01-24 16:06:08 -05:00
Gennadiy Civil 264ba3e68e Merge branch 'master' of https://github.com/google/googletest 2018-01-24 14:59:43 -05:00
Gennadiy Civil e29805aa5d upstream cl 182543808 2018-01-24 13:04:36 -05:00
Gennadiy Civil 7a2563a514 Merge branch 'master' of https://github.com/google/googletest 2018-01-24 12:36:05 -05:00
Gennadiy Civil 06c3cce867 revert, lets get this compiled 2018-01-24 12:14:16 -05:00
Gennadiy Civil 80defcec57 Many code merge/upstream changes 2018-01-23 12:33:54 -05:00
Gennadiy Civil 58df576056 Merge branch 'master' of https://github.com/google/googletest 2018-01-23 10:16:38 -05:00
Gennadiy Civil 6723b6c588 Merging, upstream http://cl/182836545 2018-01-23 10:15:28 -05:00
Gennadiy Civil bbb17ad0f7 more code merge 2018-01-22 15:28:55 -05:00
Gennadiy Civil f1c87ad9f5 merges, cl/155419551 and other 2018-01-22 15:20:19 -05:00
Gennadiy Civil 9bc86661f8 more merging 2018-01-22 14:43:51 -05:00
Gennadiy Civil a0435a54ce merging 2018-01-22 14:14:05 -05:00
Gennadiy Civil 8d707dfe81 code merge 2018-01-22 11:47:30 -05:00
Gennadiy Civil b1623e9144 Adding python tests to Bazel build file. 2018-01-18 14:32:31 -05:00
Gennadiy Civil 08b323f717 Reverting some changes, need to make the merge compile 2018-01-15 18:16:11 -05:00
Gennadiy Civil 9195571c69 Reverting some changes, need to make the merge compile 2018-01-15 17:39:33 -05:00
Gennadiy Civil 6d04de7419 Reverting some changes, need to make the merge compile 2018-01-15 17:36:45 -05:00
Gennadiy Civil b9e297838d Reverting some changes, need to make the merge compile 2018-01-15 17:34:46 -05:00
Gennadiy Civil 304be8f009 Test files for corresponding changes 2018-01-15 17:15:52 -05:00
Gennadiy Civil 6befe422f2 Test files for corresponding changes 2018-01-15 16:59:57 -05:00
Gennadiy Civil f45c22c482 Test files for corresponding changes 2018-01-15 16:56:17 -05:00
Gennadiy Civil 5f4ce9d884 Test files for corresponding changes 2018-01-15 16:46:16 -05:00
Gennadiy Civil 26085d7675 Merge branch 'master' of github.com:gennadiycivil/googletest 2018-01-15 16:23:37 -05:00
Gennadiy Civil d629744ec0 More code merges 2018-01-15 16:23:23 -05:00
Gennadiy Civil 6c86598805 Merge branch 'master' of https://github.com/google/googletest 2018-01-15 16:22:59 -05:00
Gennadiy Civil da1f7fe1e7 Code merging 2018-01-15 16:06:32 -05:00
Gennadiy Civil 93b77987f5 continue upstream/merge, etc 2018-01-11 17:36:34 -05:00
Gennadiy Civil 717d784ab2 Merge branch 'master' of https://github.com/google/googletest 2018-01-11 17:17:59 -05:00
Gennadiy Civil 2982dc1a58 Trying to fix travis 2018-01-11 14:57:20 -05:00
Gennadiy Civil 5add34775c Merge branch 'master' of https://github.com/google/googletest 2018-01-11 11:31:37 -05:00
Gennadiy Civil 6914ae2394 Upstream cl 103120214 2018-01-11 11:31:23 -05:00
Gennadiy Civil 1d757db65c More merge, cleanup 2018-01-10 16:49:20 -05:00
Gennadiy Civil b44ed21905 Merge branch 'master' of https://github.com/google/googletest 2018-01-10 16:46:21 -05:00
Gennadiy Civil 481fe9446a More merge, cleanup 2018-01-10 16:45:59 -05:00
Gennadiy Civil 84aa45941f Merge branch 'master' of https://github.com/google/googletest 2018-01-10 14:42:37 -05:00
Gennadiy Civil 6a26e47cfc Code merge, upstreaming accumulated changes, cleanup 2018-01-10 14:42:29 -05:00