diff options
| author |  David G. Quintas <dgq@google.com> | 2015-08-14 10:06:03 -0700 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2015-08-14 10:06:03 -0700 |
| commit | bd0d1bd5d9984a8c668e85ff25511bc4bc6f4ac9 (patch) | |
| tree | 073aa3b73effa0982aed4ba9d9d7af11a4c579ed /tools/run_tests | |
| parent | abd53265f2418b258f91b7de5a9e0eeee7bb1f70 (diff) | |
| parent | c3f48c80d454d9e4c5a285bf704c06a61944793a (diff) | |
Merge pull request #2549 from hongweiwang/zookeeper
Zookeeper name resolver
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 34 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 17 |
2 files changed, 51 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 983b8c6f65..627e6ac8c8 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -1673,6 +1673,23 @@ }, { "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc++", + "grpc++_test_util", + "grpc_test_util", + "grpc_zookeeper" + ], + "headers": [], + "language": "c++", + "name": "zookeeper_test", + "src": [ + "test/cpp/end2end/zookeeper_test.cc" + ] + }, + { + "deps": [ "end2end_certs", "end2end_fixture_chttp2_fake_security", "end2end_test_bad_hostname", @@ -13033,6 +13050,23 @@ { "deps": [ "gpr", + "grpc" + ], + "headers": [ + "include/grpc/grpc_zookeeper.h", + "src/core/client_config/resolvers/zookeeper_resolver.h" + ], + "language": "c", + "name": "grpc_zookeeper", + "src": [ + "include/grpc/grpc_zookeeper.h", + "src/core/client_config/resolvers/zookeeper_resolver.c", + "src/core/client_config/resolvers/zookeeper_resolver.h" + ] + }, + { + "deps": [ + "gpr", "gpr_test_util", "grpc", "grpc_test_util" diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index da393d7cbe..6b3183d48a 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1475,6 +1475,23 @@ { "ci_platforms": [ "linux", + "mac", + "posix", + "windows" + ], + "flaky": false, + "language": "c++", + "name": "zookeeper_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "ci_platforms": [ + "linux", "posix", "windows" ], |