diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-08-29 12:16:56 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-08-29 12:16:56 -0700 |
| commit | d9b82bdecbf44cc7f9116be45a862457a727e87f (patch) | |
| tree | 3d1894476ca48867e5ffe799301112f0735a8859 /test/core/client_channel | |
| parent | 016ad385e776cd41c0021739435c7bceedd9555c (diff) | |
| parent | 9811915ba3fa1ccdf44b6a70fe1b1dd4782cd508 (diff) | |
Merge github.com:grpc/grpc into grpc_millis
Diffstat (limited to 'test/core/client_channel')
| -rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_connectivity_test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c index d6713c5163..4597285063 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c @@ -60,7 +60,8 @@ static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, static grpc_ares_request *my_dns_lookup_ares( grpc_exec_ctx *exec_ctx, const char *dns_server, const char *addr, const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **lb_addrs, bool check_grpclb) { + grpc_closure *on_done, grpc_lb_addresses **lb_addrs, bool check_grpclb, + char **service_config_json) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); grpc_error *error = GRPC_ERROR_NONE; |