From ae5b17015554da18e9d49ba0069d6e88d6835eac Mon Sep 17 00:00:00 2001
From: Julien Boeuf <jboeuf@google.com>
Date: Wed, 20 May 2015 07:54:36 +0200
Subject: [PATCH] Fixing test.
---
.../core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c | 3 ++-
third_party/protobuf | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c b/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
index 1f53e581ab..b15a18f1a7 100644
--- a/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
+++ b/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
@@ -63,7 +63,8 @@ static grpc_transport_setup_result server_setup_transport(
static grpc_channel_filter const *extra_filters[] = {
&grpc_http_server_filter};
return grpc_server_setup_transport(f->server, transport, extra_filters,
- GPR_ARRAY_SIZE(extra_filters), mdctx);
+ GPR_ARRAY_SIZE(extra_filters), mdctx,
+ grpc_server_get_channel_args(f->server));
}
typedef struct {
diff --git a/third_party/protobuf b/third_party/protobuf
index a8b38c598d..644a6a1da7 160000
--- a/third_party/protobuf
+++ b/third_party/protobuf
@@ -1 +1 @@
-Subproject commit a8b38c598d7f65b281a72809b28117afdb760931
+Subproject commit 644a6a1da71385e9d7a7a26b3476c93fdd71788c
--
GitLab