diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-24 13:00:10 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-24 13:00:10 -0700 |
| commit | d30699c7bebfa3cb0ad4ba1eac99284a52b7859f (patch) | |
| tree | 32ed6c891354680361699707301273eee4c9ac54 /test/core/end2end/fixtures/h2_sockpair+trace.c | |
| parent | 654aa869d2817a9be127f66df8cd8b18e7b760bc (diff) | |
| parent | 13ca42dbae2656b97b3e40e0fa8b63aae7fd5dd5 (diff) | |
Merge remote-tracking branch 'upstream/master' into reflection_header
Diffstat (limited to 'test/core/end2end/fixtures/h2_sockpair+trace.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_sockpair+trace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index b8a5257ab2..dd4376f046 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -40,7 +40,7 @@ #include <grpc/support/sync.h> #include <grpc/support/thd.h> #include <grpc/support/useful.h> -#include "src/core/ext/client_config/client_channel.h" +#include "src/core/ext/client_channel/client_channel.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/compress_filter.h" #include "src/core/lib/channel/connected_channel.h" @@ -97,7 +97,9 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( } static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { + grpc_channel_args *client_args, + const char *query_args) { + GPR_ASSERT(query_args == NULL); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; |