diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-26 13:06:03 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-26 13:06:03 -0700 |
| commit | e4e457ed76fd9e23559f0b23e262459fc85e175c (patch) | |
| tree | 207b644c704b1d0ef6bf894fc8d0e8a6e20ee00e /tools | |
| parent | bfe56801ad916248f43c2dcfaa96bd7442a65ae2 (diff) | |
| parent | d4a5971ae89e124f67781a6fda57b36af3d7fb54 (diff) | |
Merge remote-tracking branch 'upstream/master' into circular_dependency_fix
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 4 | ||||
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 6e8de9848e..8db1a79be0 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -935,7 +935,6 @@ src/core/ext/client_channel/parse_address.h \ src/core/ext/client_channel/resolver.h \ src/core/ext/client_channel/resolver_factory.h \ src/core/ext/client_channel/resolver_registry.h \ -src/core/ext/client_channel/resolver_result.h \ src/core/ext/client_channel/subchannel.h \ src/core/ext/client_channel/subchannel_index.h \ src/core/ext/client_channel/uri_parser.h \ @@ -1132,7 +1131,6 @@ src/core/ext/client_channel/parse_address.c \ src/core/ext/client_channel/resolver.c \ src/core/ext/client_channel/resolver_factory.c \ src/core/ext/client_channel/resolver_registry.c \ -src/core/ext/client_channel/resolver_result.c \ src/core/ext/client_channel/subchannel.c \ src/core/ext/client_channel/subchannel_index.c \ src/core/ext/client_channel/uri_parser.c \ diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 29f6533398..0c6efda1f4 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -385,10 +385,10 @@ class PythonLanguage: 'PYTHONPATH': '{}/src/python/gens'.format(DOCKER_WORKDIR_ROOT)} def unimplemented_test_cases(self): - return _SKIP_ADVANCED + _SKIP_COMPRESSION + return _SKIP_COMPRESSION def unimplemented_test_cases_server(self): - return _SKIP_ADVANCED + _SKIP_COMPRESSION + return _SKIP_COMPRESSION def __str__(self): return 'python' diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index b77f4560fd..d7d6911c0e 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -6820,7 +6820,6 @@ "src/core/ext/client_channel/resolver.h", "src/core/ext/client_channel/resolver_factory.h", "src/core/ext/client_channel/resolver_registry.h", - "src/core/ext/client_channel/resolver_result.h", "src/core/ext/client_channel/subchannel.h", "src/core/ext/client_channel/subchannel_index.h", "src/core/ext/client_channel/uri_parser.h" @@ -6856,8 +6855,6 @@ "src/core/ext/client_channel/resolver_factory.h", "src/core/ext/client_channel/resolver_registry.c", "src/core/ext/client_channel/resolver_registry.h", - "src/core/ext/client_channel/resolver_result.c", - "src/core/ext/client_channel/resolver_result.h", "src/core/ext/client_channel/subchannel.c", "src/core/ext/client_channel/subchannel.h", "src/core/ext/client_channel/subchannel_index.c", |