diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-05 12:54:51 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-05 12:54:51 -0700 |
| commit | cf0e79638f44d3b52ab39f0996fee7e2dc594f72 (patch) | |
| tree | 60bffe790ad49ec4063bf4b2b191a7c0bc6c7e10 /build.json | |
| parent | a529eca9475cf7aae3d5615d59918283fac7b602 (diff) | |
| parent | 64f32dc7efe18a6fe75c71b31a36ce523290e70c (diff) | |
Merge branch 'propagate' into reduce-mac-load
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 81 |
1 files changed, 60 insertions, 21 deletions
diff --git a/build.json b/build.json index 934931097b..8ee9da9d76 100644 --- a/build.json +++ b/build.json @@ -151,7 +151,6 @@ "src/core/iomgr/iomgr_internal.h", "src/core/iomgr/iomgr_posix.h", "src/core/iomgr/pollset.h", - "src/core/iomgr/pollset_kick_posix.h", "src/core/iomgr/pollset_posix.h", "src/core/iomgr/pollset_set.h", "src/core/iomgr/pollset_set_posix.h", @@ -249,7 +248,6 @@ "src/core/iomgr/iomgr.c", "src/core/iomgr/iomgr_posix.c", "src/core/iomgr/iomgr_windows.c", - "src/core/iomgr/pollset_kick_posix.c", "src/core/iomgr/pollset_multipoller_with_epoll.c", "src/core/iomgr/pollset_multipoller_with_poll_posix.c", "src/core/iomgr/pollset_posix.c", @@ -576,6 +574,23 @@ "vs_project_guid": "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}" }, { + "name": "reconnect_server", + "build": "private", + "language": "c", + "headers": [ + "test/core/util/reconnect_server.h" + ], + "src": [ + "test/core/util/reconnect_server.c" + ], + "deps": [ + "grpc_test_util", + "grpc", + "gpr_test_util", + "gpr" + ] + }, + { "name": "grpc++", "build": "all", "language": "c++", @@ -1693,25 +1708,6 @@ ] }, { - "name": "poll_kick_posix_test", - "build": "test", - "language": "c", - "src": [ - "test/core/iomgr/poll_kick_posix_test.c" - ], - "deps": [ - "grpc_test_util", - "grpc", - "gpr_test_util", - "gpr" - ], - "platforms": [ - "mac", - "linux", - "posix" - ] - }, - { "name": "resolve_address_test", "build": "test", "language": "c", @@ -2480,6 +2476,49 @@ ] }, { + "name": "reconnect_interop_client", + "build": "test", + "run": false, + "language": "c++", + "src": [ + "test/proto/empty.proto", + "test/proto/messages.proto", + "test/proto/test.proto", + "test/cpp/interop/reconnect_interop_client.cc" + ], + "deps": [ + "grpc++_test_util", + "grpc_test_util", + "grpc++", + "grpc", + "gpr_test_util", + "gpr", + "grpc++_test_config" + ] + }, + { + "name": "reconnect_interop_server", + "build": "test", + "run": false, + "language": "c++", + "src": [ + "test/proto/empty.proto", + "test/proto/messages.proto", + "test/proto/test.proto", + "test/cpp/interop/reconnect_interop_server.cc" + ], + "deps": [ + "reconnect_server", + "grpc++_test_util", + "grpc_test_util", + "grpc++", + "grpc", + "gpr_test_util", + "gpr", + "grpc++_test_config" + ] + }, + { "name": "secure_auth_context_test", "build": "test", "language": "c++", |