diff options
author | Craig Tiller <ctiller@google.com> | 2017-06-07 13:00:06 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-06-07 13:00:06 -0700 |
commit | 1c8a90473dd3da08287fb6a474c4c708f87241c9 (patch) | |
tree | 9b5b84bfa53f36eb9f94c453a8da28509bd4fb70 /tools | |
parent | dfd7a4dc0da88b63710ce51e61b827fe0af3ffce (diff) | |
parent | 3f02e8cb4ba8882ee710b6af766bc7c6b74594e4 (diff) |
Merge github.com:grpc/grpc into ALL-the-things
Diffstat (limited to 'tools')
-rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 2 | ||||
-rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 67 | ||||
-rw-r--r-- | tools/run_tests/generated/tests.json | 56 |
3 files changed, 81 insertions, 44 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 20956cc6f4..70e332970f 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -950,6 +950,8 @@ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c \ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h \ src/core/ext/filters/client_channel/resolver/dns/native/README.md \ src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.c \ +src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c \ +src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h \ src/core/ext/filters/client_channel/resolver/sockaddr/README.md \ src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.c \ src/core/ext/filters/client_channel/resolver_factory.c \ diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index ccb3d6abca..bfcdc6060a 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -2913,6 +2913,25 @@ { "deps": [ "gpr", + "gpr_test_util", + "grpc", + "grpc++", + "grpc++_test_util", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "client_lb_end2end_test", + "src": [ + "test/cpp/end2end/client_lb_end2end_test.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", "grpc", "grpc++", "grpc++_codegen_base" @@ -3782,25 +3801,6 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "round_robin_end2end_test", - "src": [ - "test/cpp/end2end/round_robin_end2end_test.cc" - ], - "third_party": false, - "type": "target" - }, - { - "deps": [ - "gpr", - "gpr_test_util", - "grpc", - "grpc++", - "grpc++_test_util", - "grpc_test_util" - ], - "headers": [], - "is_filegroup": false, - "language": "c++", "name": "secure_auth_context_test", "src": [ "test/cpp/common/secure_auth_context_test.cc" @@ -5832,6 +5832,7 @@ "grpc_message_size_filter", "grpc_resolver_dns_ares", "grpc_resolver_dns_native", + "grpc_resolver_fake", "grpc_resolver_sockaddr", "grpc_secure", "grpc_server_backward_compatibility", @@ -5939,6 +5940,7 @@ "grpc_message_size_filter", "grpc_resolver_dns_ares", "grpc_resolver_dns_native", + "grpc_resolver_fake", "grpc_resolver_sockaddr", "grpc_server_backward_compatibility", "grpc_transport_chttp2_client_insecure", @@ -8341,6 +8343,7 @@ "gpr", "grpc_base", "grpc_client_channel", + "grpc_resolver_fake", "nanopb" ], "headers": [ @@ -8376,6 +8379,7 @@ "gpr", "grpc_base", "grpc_client_channel", + "grpc_resolver_fake", "grpc_secure", "nanopb" ], @@ -8541,6 +8545,25 @@ "grpc_base", "grpc_client_channel" ], + "headers": [ + "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" + ], + "is_filegroup": true, + "language": "c", + "name": "grpc_resolver_fake", + "src": [ + "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c", + "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" + ], + "third_party": false, + "type": "filegroup" + }, + { + "deps": [ + "gpr", + "grpc_base", + "grpc_client_channel" + ], "headers": [], "is_filegroup": true, "language": "c", @@ -8656,8 +8679,8 @@ "grpc" ], "headers": [ + "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h", "test/core/end2end/cq_verifier.h", - "test/core/end2end/fake_resolver.h", "test/core/end2end/fixtures/http_proxy_fixture.h", "test/core/end2end/fixtures/proxy.h", "test/core/iomgr/endpoint_tests.h", @@ -8676,10 +8699,10 @@ "language": "c", "name": "grpc_test_util_base", "src": [ + "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c", + "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h", "test/core/end2end/cq_verifier.c", "test/core/end2end/cq_verifier.h", - "test/core/end2end/fake_resolver.c", - "test/core/end2end/fake_resolver.h", "test/core/end2end/fixtures/http_proxy_fixture.c", "test/core/end2end/fixtures/http_proxy_fixture.h", "test/core/end2end/fixtures/proxy.c", diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 1242025fc2..337cce829e 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -3142,6 +3142,32 @@ "cpu_cost": 1.0, "exclude_configs": [], "exclude_iomgrs": [], + "excluded_poll_engines": [ + "poll", + "poll-cv" + ], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "client_lb_end2end_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], "flaky": false, "gtest": true, "language": "c++", @@ -3452,6 +3478,10 @@ "cpu_cost": 1.0, "exclude_configs": [], "exclude_iomgrs": [], + "excluded_poll_engines": [ + "poll", + "poll-cv" + ], "flaky": false, "gtest": true, "language": "c++", @@ -3474,6 +3504,10 @@ "cpu_cost": 1.0, "exclude_configs": [], "exclude_iomgrs": [], + "excluded_poll_engines": [ + "poll", + "poll-cv" + ], "flaky": false, "gtest": false, "language": "c++", @@ -3693,28 +3727,6 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "round_robin_end2end_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [], - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": true, - "language": "c++", "name": "secure_auth_context_test", "platforms": [ "linux", |