Commits · 466a49ae305145cf1fa32d172e4f5e8919ee6f4d · yangql / googletest

23 Mar, 2018 1 commit
- · 466a49ae
  Gennadiy Civil authored Mar 23, 2018
```
gmock-matchers merging -2 
```
  466a49ae
22 Mar, 2018 8 commits
- Merge branch 'master' of https://github.com/google/googletest · a28a7eb5
  Gennadiy Civil authored Mar 22, 2018
  
  a28a7eb5
- Merge pull request #1510 from gennadiycivil/master · dfa853b6
  Gennadiy Civil authored Mar 22, 2018
```
More merges, restruct some
```
  dfa853b6
- merging, gmock -1 · b7c56832
  Gennadiy Civil authored Mar 22, 2018
  
  b7c56832
- Merge branch 'master' into master · a1692ed1
  Gennadiy Civil authored Mar 22, 2018
  
  a1692ed1
- reverting gtest_list_tests_unittest.py · 4e89c76d
  Gennadiy Civil authored Mar 22, 2018
  
  4e89c76d
- Update appveyor.yml · eaaa422c
  Gennadiy Civil authored Mar 22, 2018
  
  eaaa422c
- more merges · da71e8c8
  Gennadiy Civil authored Mar 22, 2018
  
  da71e8c8
- more merges · 0f656795
  Gennadiy Civil authored Mar 22, 2018
  
  0f656795
21 Mar, 2018 1 commit
- More merges · 691e38e5
  Gennadiy Civil authored Mar 21, 2018
  
  691e38e5
19 Mar, 2018 1 commit
- Merge pull request #1508 from gennadiycivil/master · dccc2d67
  Gennadiy Civil authored Mar 19, 2018
```
merge, again, IsRecursiveContainer
```
  dccc2d67
16 Mar, 2018 2 commits
- cl 189032107, again · a3c2e107
  Gennadiy Civil authored Mar 16, 2018
  
  a3c2e107
- cl 189032107 · 080fcbe0
  Gennadiy Civil authored Mar 16, 2018
  
  080fcbe0
15 Mar, 2018 1 commit
- merge, again, IsRecursiveContainer · a178cc7e
  Gennadiy Civil authored Mar 15, 2018
  
  a178cc7e
14 Mar, 2018 2 commits
- Merge pull request #1504 from gennadiycivil/master · a325ad2d
  Gennadiy Civil authored Mar 14, 2018
```
Merges
```
  a325ad2d
- erging, cont · 262aaf2f
  Gennadiy Civil authored Mar 14, 2018
  
  262aaf2f
13 Mar, 2018 4 commits
- merging, merging · 2814b4b0
  Gennadiy Civil authored Mar 13, 2018
  
  2814b4b0
- fixing, was removing too much · a719320a
  Gennadiy Civil authored Mar 13, 2018
  
  a719320a
- Merge branch 'master' of https://github.com/google/googletest · 5461f63d
  Gennadiy Civil authored Mar 13, 2018
  
  5461f63d
- More merges, removing old dead code · af463c43
  Gennadiy Civil authored Mar 13, 2018
  
  af463c43
12 Mar, 2018 5 commits
- Merge pull request #1503 from sheepmaster/upstream_188748737 · f35fe6de
  Gennadiy Civil authored Mar 12, 2018
```
Allow macros inside of parametrized test names.
```
  f35fe6de
- Merge branch 'master' into upstream_188748737 · fc437ef4
  Bernhard Bauer authored Mar 12, 2018
  
  fc437ef4
- Allow macros inside of parametrized test names. · 7b70413e
  Bernhard Bauer authored Mar 12, 2018
```
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.
```
  7b70413e
- Merge pull request #1502 from gennadiycivil/master · abc6e943
  Gennadiy Civil authored Mar 12, 2018
```
merges-port(1)
```
  abc6e943
- · cf9d6344
  Gennadiy Civil authored Mar 12, 2018
```
merges-port(1)
```
  cf9d6344
07 Mar, 2018 2 commits
- Merge pull request #1497 from gennadiycivil/master · 9bda90b7
  Gennadiy Civil authored Mar 07, 2018
```
Merging, XML tests
```
  9bda90b7
- Merging, XML tests · e8919006
  Gennadiy Civil authored Mar 07, 2018
  
  e8919006
05 Mar, 2018 13 commits
- Merge pull request #1493 from gennadiycivil/master · 703b4a85
  Gennadiy Civil authored Mar 05, 2018
```
merges-8
```
  703b4a85
- merges-8 · 89d6f70f
  Gennadiy Civil authored Mar 05, 2018
  
  89d6f70f
- Merge pull request #1492 from gennadiycivil/master · 617e2c56
  Gennadiy Civil authored Mar 05, 2018
```
merges-7
```
  617e2c56
- merges-7 · 995a9dfa
  Gennadiy Civil authored Mar 05, 2018
  
  995a9dfa
- Merge pull request #1491 from gennadiycivil/master · ae4480f9
  Gennadiy Civil authored Mar 05, 2018
```
merges-6
```
  ae4480f9
- · 086825de
  Gennadiy Civil authored Mar 05, 2018
```
merges-6
```
  086825de
- Merge pull request #1490 from gennadiycivil/master · 731dbc4a
  Gennadiy Civil authored Mar 05, 2018
```
merges-4
```
  731dbc4a
- Merge branch 'master' of https://github.com/google/googletest · 94d78ea1
  Gennadiy Civil authored Mar 05, 2018
  
  94d78ea1
- merges-3 · 83859284
  Gennadiy Civil authored Mar 05, 2018
  
  83859284
- Merge pull request #1489 from gennadiycivil/master · c3a007f3
  Gennadiy Civil authored Mar 05, 2018
```
Merges-2
```
  c3a007f3
- Merge branch 'master' of https://github.com/google/googletest · 73bf4129
  Gennadiy Civil authored Mar 05, 2018
  
  73bf4129
- · dbf63e38
  Gennadiy Civil authored Mar 05, 2018
```
merges-2
```
  dbf63e38
- Merge pull request #1488 from gennadiycivil/master · a7ffeca9
  Gennadiy Civil authored Mar 05, 2018
```
Merges
```
  a7ffeca9