diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-10-04 15:17:50 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-10-04 15:17:50 -0700 |
| commit | cfe47deca438844140590ed44f23b3b80aa4cc1f (patch) | |
| tree | 719d641534ab33d12ab0925418c15a031d73dac9 /test/core | |
| parent | 8362e7042d4c7d41c756d85b4e64d499ae4e52ed (diff) | |
| parent | fbbf4593d69823b1a3d75e910c714a783116648f (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-server-sockets
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/handshake/readahead_handshaker_server_ssl.cc | 1 | ||||
| -rw-r--r-- | test/core/iomgr/resolve_address_test.cc | 5 | ||||
| -rw-r--r-- | test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index 97e9c20ee4..14d96b5d89 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -75,6 +75,7 @@ static grpc_handshaker* readahead_handshaker_create() { static void readahead_handshaker_factory_add_handshakers( grpc_handshaker_factory* hf, const grpc_channel_args* args, + grpc_pollset_set* interested_parties, grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add(handshake_mgr, readahead_handshaker_create()); } diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 52e4840c7c..8d69bab5b1 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -251,7 +251,10 @@ int main(int argc, char** argv) { gpr_cmdline* cl = gpr_cmdline_create("resolve address test"); gpr_cmdline_add_string(cl, "resolver", "Resolver type (ares or native)", &resolver_type); - gpr_cmdline_parse(cl, argc, argv); + // In case that there are more than one argument on the command line, + // --resolver will always be the first one, so only parse the first argument + // (other arguments may be unknown to cl) + gpr_cmdline_parse(cl, argc > 2 ? 2 : argc, argv); const char* cur_resolver = gpr_getenv("GRPC_DNS_RESOLVER"); if (cur_resolver != nullptr && strlen(cur_resolver) != 0) { gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 85a58114ba..e9eb7e175f 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -421,7 +421,7 @@ static tsi_handshaker* create_test_handshaker(bool used_for_success_test, alts_mock_handshaker_client_create(used_for_success_test); grpc_alts_credentials_options* options = grpc_alts_credentials_client_options_create(); - alts_tsi_handshaker_create(options, "target_name", "lame", is_client, + alts_tsi_handshaker_create(options, "target_name", "lame", is_client, nullptr, &handshaker); alts_tsi_handshaker* alts_handshaker = reinterpret_cast<alts_tsi_handshaker*>(handshaker); |