aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | merging gtest-port.h, again - 1Gennadiy Civil2018-04-021-5/+9
|/ /
| * Merge branch 'master' into int3Roland Leißa2018-03-302-25/+46
| |\ | |/ |/|
* | Include OSX builds back into PR buildsGennadiy Civil2018-03-291-2/+0
| | | | | | Had an instance where the breakage was not detected until the actual merge. Need to be better than that
* | Merge pull request #1527 from google/revert-1518-masterGennadiy Civil2018-03-291-14/+9
|\ \ | | | | | | Revert "merging gtest-port 1 of N"
| * | Revert "merging gtest-port 1 of N"Gennadiy Civil2018-03-291-14/+9
|/ /
* | Merge pull request #1526 from google/revert-1525-masterGennadiy Civil2018-03-291-9/+37
|\ \ | | | | | | Revert "merging gtest-port, 2"
| * | Revert "merging gtest-port, 2"Gennadiy Civil2018-03-291-9/+37
|/ /
| * Merge remote-tracking branch 'google/master' into int3Roland Leißa2018-03-291-37/+9
| |\ | |/ |/|
* | Merge pull request #1525 from gennadiycivil/masterGennadiy Civil2018-03-291-37/+9
|\ \ | | | | | | merging gtest-port, 2
| * | merging gtest-port, 2Gennadiy Civil2018-03-291-37/+9
|/ /
| * typoRoland Leißa2018-03-291-1/+1
| |
| * provide alternative for DebugBreak()Roland Leißa2018-03-281-0/+3
|/ | | | This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
* Merge pull request #1518 from gennadiycivil/masterGennadiy Civil2018-03-271-9/+14
|\ | | | | merging gtest-port 1 of N
| * merging gtest-port 1 of NGennadiy Civil2018-03-271-9/+14
|/
* Merge pull request #1515 from gennadiycivil/masterGennadiy Civil2018-03-264-12/+17
|\ | | | | merges
| * merges 1Gennadiy Civil2018-03-261-3/+2
| |
| * 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
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 05:41:13 +0000