diff options
| -rw-r--r-- | src/proto/grpc/lb/v1/BUILD | 39 | ||||
| -rw-r--r-- | test/core/client_channel/resolvers/BUILD | 3 | ||||
| -rw-r--r-- | test/cpp/end2end/BUILD | 5 | ||||
| -rw-r--r-- | test/cpp/end2end/grpclb_end2end_test.cc | 3 |
4 files changed, 45 insertions, 5 deletions
diff --git a/src/proto/grpc/lb/v1/BUILD b/src/proto/grpc/lb/v1/BUILD new file mode 100644 index 0000000000..46d4f2d62c --- /dev/null +++ b/src/proto/grpc/lb/v1/BUILD @@ -0,0 +1,39 @@ +# Copyright 2017, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +licenses(["notice"]) # 3-clause BSD + +package(default_visibility = ["//visibility:public"]) + +load("//bazel:grpc_build_system.bzl", "grpc_proto_library") + +grpc_proto_library( + name = "load_balancer_proto", + srcs = ["load_balancer.proto"], +) diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD index 0e670865cd..e8361cdef6 100644 --- a/test/core/client_channel/resolvers/BUILD +++ b/test/core/client_channel/resolvers/BUILD @@ -68,10 +68,11 @@ cc_test( cc_test( name = "fake_resolver_test", srcs = ["fake_resolver_test.c"], - copts = ['-std=c99'] + copts = ["-std=c99"], deps = [ "//:gpr", "//:grpc", + "//test/core/end2end:fake_resolver", "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", ], diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD index b077ee98a5..0bd41d153b 100644 --- a/test/cpp/end2end/BUILD +++ b/test/cpp/end2end/BUILD @@ -48,10 +48,10 @@ cc_test( "//:grpc", "//:grpc++", "//external:gtest", + "//src/proto/grpc/health/v1:health_proto", "//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_proto", - "//src/proto/grpc/health/v1:health_proto", "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", @@ -198,7 +198,6 @@ cc_test( ], ) - cc_test( name = "grpclb_end2end_test", srcs = ["grpclb_end2end_test.cc"], @@ -208,9 +207,11 @@ cc_test( "//:grpc", "//:grpc++", "//external:gtest", + "//src/proto/grpc/lb/v1:load_balancer_proto", "//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_proto", + "//test/core/end2end:fake_resolver", "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index eed009ab8b..41e3448cef 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -31,7 +31,6 @@ * */ -#include <arpa/inet.h> #include <memory> #include <mutex> #include <sstream> @@ -51,6 +50,7 @@ #include <gtest/gtest.h> extern "C" { +#include "src/core/lib/iomgr/sockaddr.h" #include "test/core/end2end/fake_resolver.h" } @@ -369,7 +369,6 @@ class GrpclbEnd2endTest : public ::testing::Test { const grpc::string server_host_; const size_t num_backends_; const size_t num_balancers_; - CompletionQueue cli_cq_; std::shared_ptr<Channel> channel_; std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_; |