Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merges, gtest | Gennadiy Civil | 2018-03-26 | 4 | -13/+19 |
| | |||||
* | merging gmock-matchers.h 3 | Gennadiy Civil | 2018-03-26 | 1 | -13/+36 |
| | |||||
* | merging gmock-matchers.h 2 | Gennadiy Civil | 2018-03-26 | 1 | -7/+44 |
| | |||||
* | Upstreaming FloatingEq2Matcher, | Gennadiy Civil | 2018-03-26 | 1 | -9/+13 |
| | |||||
* | Merging gmock-matchers.h -2 | Gennadiy Civil | 2018-03-23 | 1 | -29/+208 |
| | |||||
* | gmock-matchers merging -2 | Gennadiy Civil | 2018-03-23 | 1 | -10/+250 |
| | |||||
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-22 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #1510 from gennadiycivil/master | Gennadiy Civil | 2018-03-22 | 4 | -30/+38 |
| |\ | | | | | | | More merges, restruct some | ||||
| | * | Merge branch 'master' into master | Gennadiy Civil | 2018-03-22 | 1 | -1/+1 |
| | |\ | | |/ | |/| | |||||
| * | | Update appveyor.yml | Gennadiy Civil | 2018-03-22 | 1 | -1/+1 |
| | | | |||||
* | | | merging, gmock -1 | Gennadiy Civil | 2018-03-22 | 4 | -60/+120 |
| |/ |/| | |||||
* | | reverting gtest_list_tests_unittest.py | Gennadiy Civil | 2018-03-22 | 1 | -2/+2 |
| | | |||||
* | | more merges | Gennadiy Civil | 2018-03-22 | 1 | -2/+3 |
| | | |||||
* | | more merges | Gennadiy Civil | 2018-03-22 | 4 | -5/+5 |
| | | |||||
* | | More merges | Gennadiy Civil | 2018-03-21 | 3 | -28/+35 |
|/ | |||||
* | Merge pull request #1508 from gennadiycivil/master | Gennadiy Civil | 2018-03-19 | 5 | -23/+130 |
|\ | | | | | merge, again, IsRecursiveContainer | ||||
| * | cl 189032107, again | Gennadiy Civil | 2018-03-16 | 2 | -5/+19 |
| | | |||||
| * | cl 189032107 | Gennadiy Civil | 2018-03-16 | 3 | -19/+9 |
| | | |||||
| * | merge, again, IsRecursiveContainer | Gennadiy Civil | 2018-03-15 | 6 | -20/+123 |
|/ | |||||
* | Merge pull request #1504 from gennadiycivil/master | Gennadiy Civil | 2018-03-14 | 4 | -72/+24 |
|\ | | | | | Merges | ||||
| * | erging, cont | Gennadiy Civil | 2018-03-14 | 1 | -15/+4 |
| | | |||||
| * | merging, merging | Gennadiy Civil | 2018-03-13 | 2 | -39/+23 |
| | | |||||
| * | fixing, was removing too much | Gennadiy Civil | 2018-03-13 | 1 | -0/+37 |
| | | |||||
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-13 | 4 | -8/+35 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1503 from sheepmaster/upstream_188748737 | Gennadiy Civil | 2018-03-12 | 4 | -8/+35 |
|\ \ | | | | | | | Allow macros inside of parametrized test names. | ||||
| * \ | Merge branch 'master' into upstream_188748737 | Bernhard Bauer | 2018-03-12 | 64 | -620/+3159 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1502 from gennadiycivil/master | Gennadiy Civil | 2018-03-12 | 1 | -14/+22 |
|\ \ \ | | | | | | | | | merges-port(1) | ||||
| | * | | Allow macros inside of parametrized test names. | Bernhard Bauer | 2018-03-12 | 4 | -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 code | Gennadiy Civil | 2018-03-13 | 4 | -72/+14 |
| | |/ | |/| | |||||
| * | | merges-port(1) | Gennadiy Civil | 2018-03-12 | 1 | -14/+22 |
|/ / | |||||
* | | Merge pull request #1497 from gennadiycivil/master | Gennadiy Civil | 2018-03-07 | 4 | -26/+114 |
|\ \ | | | | | | | Merging, XML tests | ||||
| * | | Merging, XML tests | Gennadiy Civil | 2018-03-07 | 4 | -26/+114 |
|/ / | |||||
* | | Merge pull request #1493 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 3 | -27/+47 |
|\ \ | | | | | | | merges-8 | ||||
| * | | merges-8 | Gennadiy Civil | 2018-03-05 | 3 | -27/+47 |
|/ / | |||||
* | | Merge pull request #1492 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 1 | -25/+41 |
|\ \ | | | | | | | merges-7 | ||||
| * | | merges-7 | Gennadiy Civil | 2018-03-05 | 1 | -25/+41 |
|/ / | |||||
* | | Merge pull request #1491 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 5 | -7/+4 |
|\ \ | | | | | | | merges-6 | ||||
| * | | merges-6 | Gennadiy Civil | 2018-03-05 | 5 | -7/+4 |
|/ / | |||||
* | | Merge pull request #1490 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 1 | -1/+1 |
|\ \ | | | | | | | merges-4 | ||||
| * \ | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 0 | -0/+0 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1489 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 2 | -4/+14 |
|\ \ \ | | | | | | | | | Merges-2 | ||||
| | * | | merges-3 | Gennadiy Civil | 2018-03-05 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 0 | -0/+0 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1488 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 3 | -12/+17 |
|\ \ \ | | | | | | | | | Merges | ||||
| | * | | merges-2 | Gennadiy Civil | 2018-03-05 | 2 | -4/+14 |
| |/ / | |||||
| * | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 3 | -2/+8 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1477 from sgraham/unsigned-wchar | Gennadiy Civil | 2018-03-05 | 2 | -0/+6 |
|\ \ \ | | | | | | | | | Try to handle unsigned wchar_t (arm) a bit better | ||||
| * \ \ | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-05 | 1 | -2/+2 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1486 from petrhosek/json-stacktrace | Gennadiy Civil | 2018-03-02 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Use a full message in the JSON output for failures | ||||
| * | | | | Use a full message in the JSON output for failures | Petr Hosek | 2018-03-01 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | The full message unlike summary also includes stack trace. |