aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-260-0/+0
| |\ | |/ |/|
* | Merge pull request #1512 from gennadiycivil/masterGennadiy Civil2018-03-264-119/+662
|\ \ | | | | | | merges, gmock - 1
| | * merges, gtestGennadiy Civil2018-03-264-13/+19
| |/
| * merging gmock-matchers.h 3Gennadiy Civil2018-03-261-13/+36
| |
| * merging gmock-matchers.h 2Gennadiy Civil2018-03-261-7/+44
| |
| * Upstreaming FloatingEq2Matcher,Gennadiy Civil2018-03-261-9/+13
| |
| * Merging gmock-matchers.h -2 Gennadiy Civil2018-03-231-29/+208
| |
| * gmock-matchers merging -2 Gennadiy Civil2018-03-231-10/+250
| |
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-221-1/+1
| |\ | |/ |/|
* | Merge pull request #1510 from gennadiycivil/masterGennadiy Civil2018-03-224-30/+38
|\ \ | | | | | | More merges, restruct some
| * \ Merge branch 'master' into masterGennadiy Civil2018-03-221-1/+1
| |\ \ | |/ / |/| |
* | | Update appveyor.ymlGennadiy Civil2018-03-221-1/+1
| | |
| | * merging, gmock -1Gennadiy Civil2018-03-224-60/+120
| |/
| * reverting gtest_list_tests_unittest.pyGennadiy Civil2018-03-221-2/+2
| |
| * more mergesGennadiy Civil2018-03-221-2/+3
| |
| * more mergesGennadiy Civil2018-03-224-5/+5
| |
| * More mergesGennadiy Civil2018-03-213-28/+35
|/
* Merge pull request #1508 from gennadiycivil/masterGennadiy Civil2018-03-195-23/+130
|\ | | | | merge, again, IsRecursiveContainer
| * cl 189032107, againGennadiy Civil2018-03-162-5/+19
| |
| * cl 189032107Gennadiy Civil2018-03-163-19/+9
| |
| * merge, again, IsRecursiveContainerGennadiy Civil2018-03-156-20/+123
|/
* Merge pull request #1504 from gennadiycivil/masterGennadiy Civil2018-03-144-72/+24
|\ | | | | Merges
| * erging, contGennadiy Civil2018-03-141-15/+4
| |
| * merging, mergingGennadiy Civil2018-03-132-39/+23
| |
| * fixing, was removing too muchGennadiy Civil2018-03-131-0/+37
| |
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-134-8/+35
| |\ | |/ |/|
* | Merge pull request #1503 from sheepmaster/upstream_188748737Gennadiy Civil2018-03-124-8/+35
|\ \ | | | | | | Allow macros inside of parametrized test names.
| * \ Merge branch 'master' into upstream_188748737Bernhard Bauer2018-03-1264-620/+3159
| |\ \ | |/ / |/| |
* | | Merge pull request #1502 from gennadiycivil/masterGennadiy Civil2018-03-121-14/+22
|\ \ \ | | | | | | | | merges-port(1)
| | * | Allow macros inside of parametrized test names.Bernhard Bauer2018-03-124-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling. Upstream of cr/188748737. Tested: Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
| | | * More merges, removing old dead codeGennadiy Civil2018-03-134-72/+14
| | |/ | |/|
| * | merges-port(1)Gennadiy Civil2018-03-121-14/+22
|/ /
* | Merge pull request #1497 from gennadiycivil/masterGennadiy Civil2018-03-074-26/+114
|\ \ | | | | | | Merging, XML tests
| * | Merging, XML testsGennadiy Civil2018-03-074-26/+114
|/ /
* | Merge pull request #1493 from gennadiycivil/masterGennadiy Civil2018-03-053-27/+47
|\ \ | | | | | | merges-8
| * | merges-8Gennadiy Civil2018-03-053-27/+47
|/ /
* | Merge pull request #1492 from gennadiycivil/masterGennadiy Civil2018-03-051-25/+41
|\ \ | | | | | | merges-7
| * | merges-7Gennadiy Civil2018-03-051-25/+41
|/ /
* | Merge pull request #1491 from gennadiycivil/masterGennadiy Civil2018-03-055-7/+4
|\ \ | | | | | | merges-6
| * | merges-6Gennadiy Civil2018-03-055-7/+4
|/ /
* | Merge pull request #1490 from gennadiycivil/masterGennadiy Civil2018-03-051-1/+1
|\ \ | | | | | | merges-4
| * \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-050-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1489 from gennadiycivil/masterGennadiy Civil2018-03-052-4/+14
|\ \ \ | | | | | | | | Merges-2
| | * | merges-3Gennadiy Civil2018-03-051-1/+1
| |/ /
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-050-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1488 from gennadiycivil/masterGennadiy Civil2018-03-053-12/+17
|\ \ \ | | | | | | | | Merges
| | * | merges-2Gennadiy Civil2018-03-052-4/+14
| |/ /
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-053-2/+8
| |\ \ | |/ / |/| |
* | | Merge pull request #1477 from sgraham/unsigned-wcharGennadiy Civil2018-03-052-0/+6
|\ \ \ | | | | | | | | Try to handle unsigned wchar_t (arm) a bit better
| * \ \ Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-051-2/+2
| |\ \ \ | |/ / / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-05 10:43:16 +0000