diff options
author | Craig Tiller <ctiller@google.com> | 2017-05-01 14:26:49 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-05-01 14:26:49 -0700 |
commit | c610985aeb3931c53726e742707aa1a8b2fe84b9 (patch) | |
tree | 586cddcd4ed8380f659c681f9c5a4010553cffb0 /test/core/iomgr | |
parent | b72a74ae039d666cf6cfc60477289c03dc5b5933 (diff) | |
parent | 50da5ec21d3d8be5e76b9809242821f9e5badba1 (diff) |
Merge branch 'hiertune' into epex4+epoll1
Diffstat (limited to 'test/core/iomgr')
-rw-r--r-- | test/core/iomgr/ev_epollsig_linux_test.c (renamed from test/core/iomgr/ev_epoll_linux_test.c) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/iomgr/ev_epoll_linux_test.c b/test/core/iomgr/ev_epollsig_linux_test.c index 7693b5a398..efc8ed36be 100644 --- a/test/core/iomgr/ev_epoll_linux_test.c +++ b/test/core/iomgr/ev_epollsig_linux_test.c @@ -34,7 +34,7 @@ /* This test only relevant on linux systems where epoll() is available */ #ifdef GRPC_LINUX_EPOLL -#include "src/core/lib/iomgr/ev_epoll_linux.h" +#include "src/core/lib/iomgr/ev_epollsig_linux.h" #include "src/core/lib/iomgr/ev_posix.h" #include <errno.h> @@ -405,13 +405,13 @@ int main(int argc, char **argv) { grpc_iomgr_init(); poll_strategy = grpc_get_poll_strategy_name(); - if (poll_strategy != NULL && strcmp(poll_strategy, "epoll") == 0) { + if (poll_strategy != NULL && strcmp(poll_strategy, "epollsig") == 0) { test_add_fd_to_pollset(); test_pollset_queue_merge_items(); test_threading(); } else { gpr_log(GPR_INFO, - "Skipping the test. The test is only relevant for 'epoll' " + "Skipping the test. The test is only relevant for 'epollsig' " "strategy. and the current strategy is: '%s'", poll_strategy); } |