diff options
author | Craig Tiller <ctiller@google.com> | 2017-06-07 13:00:06 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-06-07 13:00:06 -0700 |
commit | 1c8a90473dd3da08287fb6a474c4c708f87241c9 (patch) | |
tree | 9b5b84bfa53f36eb9f94c453a8da28509bd4fb70 /build.yaml | |
parent | dfd7a4dc0da88b63710ce51e61b827fe0af3ffce (diff) | |
parent | 3f02e8cb4ba8882ee710b6af766bc7c6b74594e4 (diff) |
Merge github.com:grpc/grpc into ALL-the-things
Diffstat (limited to 'build.yaml')
-rw-r--r-- | build.yaml | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/build.yaml b/build.yaml index ab2195ebf6..56d7907891 100644 --- a/build.yaml +++ b/build.yaml @@ -518,6 +518,7 @@ filegroups: - grpc_base - grpc_client_channel - nanopb + - grpc_resolver_fake - name: grpc_lb_policy_grpclb_secure headers: - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h @@ -539,6 +540,7 @@ filegroups: - grpc_secure - grpc_client_channel - nanopb + - grpc_resolver_fake - name: grpc_lb_policy_pick_first src: - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.c @@ -598,6 +600,15 @@ filegroups: uses: - grpc_base - grpc_client_channel +- name: grpc_resolver_fake + headers: + - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h + src: + - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c + plugin: grpc_resolver_fake + uses: + - grpc_base + - grpc_client_channel - name: grpc_resolver_sockaddr src: - src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.c @@ -668,8 +679,8 @@ filegroups: - name: grpc_test_util_base build: test headers: + - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h - test/core/end2end/cq_verifier.h - - test/core/end2end/fake_resolver.h - test/core/end2end/fixtures/http_proxy_fixture.h - test/core/end2end/fixtures/proxy.h - test/core/iomgr/endpoint_tests.h @@ -684,8 +695,8 @@ filegroups: - test/core/util/slice_splitter.h - test/core/util/trickle_endpoint.h src: + - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c - test/core/end2end/cq_verifier.c - - test/core/end2end/fake_resolver.c - test/core/end2end/fixtures/http_proxy_fixture.c - test/core/end2end/fixtures/proxy.c - test/core/iomgr/endpoint_tests.c @@ -1064,6 +1075,7 @@ libs: - grpc_resolver_dns_ares - grpc_resolver_dns_native - grpc_resolver_sockaddr + - grpc_resolver_fake - grpc_load_reporting - grpc_secure - census @@ -1163,6 +1175,7 @@ libs: - grpc_resolver_dns_ares - grpc_resolver_dns_native - grpc_resolver_sockaddr + - grpc_resolver_fake - grpc_load_reporting - grpc_lb_policy_grpclb - grpc_lb_policy_pick_first @@ -3620,6 +3633,22 @@ targets: - grpc - gpr_test_util - gpr +- name: client_lb_end2end_test + gtest: true + build: test + language: c++ + src: + - test/cpp/end2end/client_lb_end2end_test.cc + deps: + - grpc++_test_util + - grpc_test_util + - grpc++ + - grpc + - gpr_test_util + - gpr + excluded_poll_engines: + - poll + - poll-cv - name: codegen_test_full gtest: true build: test @@ -3898,6 +3927,9 @@ targets: - grpc - gpr_test_util - gpr + excluded_poll_engines: + - poll + - poll-cv - name: grpclb_test gtest: false build: test @@ -3912,6 +3944,9 @@ targets: - grpc - gpr_test_util - gpr + excluded_poll_engines: + - poll + - poll-cv - name: health_service_end2end_test gtest: true build: test @@ -4211,19 +4246,6 @@ targets: - gpr_test_util - gpr - grpc++_test_config -- name: round_robin_end2end_test - gtest: true - build: test - language: c++ - src: - - test/cpp/end2end/round_robin_end2end_test.cc - deps: - - grpc++_test_util - - grpc_test_util - - grpc++ - - grpc - - gpr_test_util - - gpr - name: secure_auth_context_test gtest: true build: test |