diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-17 13:04:07 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-17 13:04:07 -0700 |
| commit | 3085aa468eff41fb1dd4c2c161c2a4dd1bd16c87 (patch) | |
| tree | 67f1b2e5ca3a6ddb144930e293cfb8562d04cbe2 /tools/run_tests | |
| parent | 38e94c2805e430d9198705a61421d91efd05db6e (diff) | |
| parent | 53c2bbdeb716f947a63a8358b76540d24f9a79b2 (diff) | |
Merge github.com:grpc/grpc into thread_pool
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index e833cf45fd..7decd99e1b 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -7966,6 +7966,7 @@ "src/core/lib/iomgr/ev_poll_posix.h", "src/core/lib/iomgr/ev_posix.c", "src/core/lib/iomgr/ev_posix.h", + "src/core/lib/iomgr/ev_windows.c", "src/core/lib/iomgr/exec_ctx.c", "src/core/lib/iomgr/exec_ctx.h", "src/core/lib/iomgr/executor.c", diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 196e26e1b6..1a16b09325 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -75,8 +75,9 @@ _FORCE_ENVIRON_FOR_WRAPPERS = { _POLLING_STRATEGIES = { - 'linux': ['epollsig', 'poll', 'poll-cv'] + 'linux': ['epollsig', 'poll', 'poll-cv'], # TODO(ctiller, sreecha): enable epoll1, epollex, epoll-thread-pool + 'mac': ['poll'], } |