aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-08-05 12:54:51 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-08-05 12:54:51 -0700
commitcf0e79638f44d3b52ab39f0996fee7e2dc594f72 (patch)
tree60bffe790ad49ec4063bf4b2b191a7c0bc6c7e10 /tools
parenta529eca9475cf7aae3d5615d59918283fac7b602 (diff)
parent64f32dc7efe18a6fe75c71b31a36ce523290e70c (diff)
Merge branch 'propagate' into reduce-mac-load
Diffstat (limited to 'tools')
-rw-r--r--tools/doxygen/Doxyfile.core.internal2
-rw-r--r--tools/run_tests/sources_and_headers.json86
-rw-r--r--tools/run_tests/tests.json10
3 files changed, 66 insertions, 32 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index cce0b6fed0..3c9b294068 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -821,7 +821,6 @@ src/core/iomgr/iomgr.h \
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 \
@@ -943,7 +942,6 @@ src/core/iomgr/iocp_windows.c \
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 \
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index c1a7f65188..b7ecf9560b 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -826,20 +826,6 @@
],
"headers": [],
"language": "c",
- "name": "poll_kick_posix_test",
- "src": [
- "test/core/iomgr/poll_kick_posix_test.c"
- ]
- },
- {
- "deps": [
- "gpr",
- "gpr_test_util",
- "grpc",
- "grpc_test_util"
- ],
- "headers": [],
- "language": "c",
"name": "resolve_address_test",
"src": [
"test/core/iomgr/resolve_address_test.c"
@@ -1527,6 +1513,55 @@
{
"deps": [
"gpr",
+ "gpr_test_util",
+ "grpc",
+ "grpc++",
+ "grpc++_test_config",
+ "grpc++_test_util",
+ "grpc_test_util"
+ ],
+ "headers": [
+ "test/proto/empty.grpc.pb.h",
+ "test/proto/empty.pb.h",
+ "test/proto/messages.grpc.pb.h",
+ "test/proto/messages.pb.h",
+ "test/proto/test.grpc.pb.h",
+ "test/proto/test.pb.h"
+ ],
+ "language": "c++",
+ "name": "reconnect_interop_client",
+ "src": [
+ "test/cpp/interop/reconnect_interop_client.cc"
+ ]
+ },
+ {
+ "deps": [
+ "gpr",
+ "gpr_test_util",
+ "grpc",
+ "grpc++",
+ "grpc++_test_config",
+ "grpc++_test_util",
+ "grpc_test_util",
+ "reconnect_server"
+ ],
+ "headers": [
+ "test/proto/empty.grpc.pb.h",
+ "test/proto/empty.pb.h",
+ "test/proto/messages.grpc.pb.h",
+ "test/proto/messages.pb.h",
+ "test/proto/test.grpc.pb.h",
+ "test/proto/test.pb.h"
+ ],
+ "language": "c++",
+ "name": "reconnect_interop_server",
+ "src": [
+ "test/cpp/interop/reconnect_interop_server.cc"
+ ]
+ },
+ {
+ "deps": [
+ "gpr",
"grpc",
"grpc++"
],
@@ -12230,7 +12265,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",
@@ -12400,8 +12434,6 @@
"src/core/iomgr/iomgr_posix.h",
"src/core/iomgr/iomgr_windows.c",
"src/core/iomgr/pollset.h",
- "src/core/iomgr/pollset_kick_posix.c",
- "src/core/iomgr/pollset_kick_posix.h",
"src/core/iomgr/pollset_multipoller_with_epoll.c",
"src/core/iomgr/pollset_multipoller_with_poll_posix.c",
"src/core/iomgr/pollset_posix.c",
@@ -12702,7 +12734,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",
@@ -12850,8 +12881,6 @@
"src/core/iomgr/iomgr_posix.h",
"src/core/iomgr/iomgr_windows.c",
"src/core/iomgr/pollset.h",
- "src/core/iomgr/pollset_kick_posix.c",
- "src/core/iomgr/pollset_kick_posix.h",
"src/core/iomgr/pollset_multipoller_with_epoll.c",
"src/core/iomgr/pollset_multipoller_with_poll_posix.c",
"src/core/iomgr/pollset_posix.c",
@@ -12992,6 +13021,23 @@
{
"deps": [
"gpr",
+ "gpr_test_util",
+ "grpc",
+ "grpc_test_util"
+ ],
+ "headers": [
+ "test/core/util/reconnect_server.h"
+ ],
+ "language": "c",
+ "name": "reconnect_server",
+ "src": [
+ "test/core/util/reconnect_server.c",
+ "test/core/util/reconnect_server.h"
+ ]
+ },
+ {
+ "deps": [
+ "gpr",
"grpc"
],
"headers": [
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 4be8295d5a..0192036420 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -478,16 +478,6 @@
{
"flaky": false,
"language": "c",
- "name": "poll_kick_posix_test",
- "platforms": [
- "linux",
- "mac",
- "posix"
- ]
- },
- {
- "flaky": false,
- "language": "c",
"name": "resolve_address_test",
"platforms": [
"posix",