Commits · 86d14079bee3c304a2c8e048d2a5d5066efda05b · yangql / googletest

29 Mar, 2018 6 commits
- Merge pull request #1527 from google/revert-1518-master · 86d14079
  Gennadiy Civil authored Mar 29, 2018
```
Revert "merging gtest-port 1 of N"
```
  86d14079
- Revert "merging gtest-port 1 of N" · b2373c6f
  Gennadiy Civil authored Mar 29, 2018
  
  b2373c6f
- Merge pull request #1526 from google/revert-1525-master · 527fd388
  Gennadiy Civil authored Mar 29, 2018
```
Revert "merging gtest-port, 2"
```
  527fd388
- Revert "merging gtest-port, 2" · 54bb165f
  Gennadiy Civil authored Mar 29, 2018
  
  54bb165f
- Merge pull request #1525 from gennadiycivil/master · 09a0e17c
  Gennadiy Civil authored Mar 29, 2018
```
merging gtest-port, 2
```
  09a0e17c
- merging gtest-port, 2 · 8e0364a3
  Gennadiy Civil authored Mar 29, 2018
  
  8e0364a3
27 Mar, 2018 2 commits
- Merge pull request #1518 from gennadiycivil/master · 9dde7c4e
  Gennadiy Civil authored Mar 27, 2018
```
merging gtest-port 1 of N
```
  9dde7c4e
- merging gtest-port 1 of N · aea6fc32
  Gennadiy Civil authored Mar 27, 2018
  
  aea6fc32
26 Mar, 2018 8 commits
- Merge pull request #1515 from gennadiycivil/master · cafa9e52
  Gennadiy Civil authored Mar 26, 2018
```
merges
```
  cafa9e52
- merges 1 · a75a5c97
  Gennadiy Civil authored Mar 26, 2018
  
  a75a5c97
- Merge branch 'master' of https://github.com/google/googletest · a0e2faf4
  Gennadiy Civil authored Mar 26, 2018
  
  a0e2faf4
- merges, gtest · 3df7cbe6
  Gennadiy Civil authored Mar 26, 2018
  
  3df7cbe6
- Merge pull request #1512 from gennadiycivil/master · 78579756
  Gennadiy Civil authored Mar 26, 2018
```
merges, gmock - 1
```
  78579756
- merging gmock-matchers.h 3 · 6aae206b
  Gennadiy Civil authored Mar 26, 2018
  
  6aae206b
- merging gmock-matchers.h 2 · 23187058
  Gennadiy Civil authored Mar 26, 2018
  
  23187058
- Upstreaming FloatingEq2Matcher, · 8ea10d38
  Gennadiy Civil authored Mar 26, 2018
  
  8ea10d38
23 Mar, 2018 2 commits
- Merging gmock-matchers.h -2 · b907c267
  Gennadiy Civil authored Mar 23, 2018
  
  b907c267
- · 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 3 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