diff options
| author |  Mehrdad Afshari <mehrdada@users.noreply.github.com> | 2018-01-17 19:55:33 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-17 19:55:33 -0800 |
| commit | e607f1a42e9673bf06649f2cecbabc32d1f829ec (patch) | |
| tree | 7adee2fee2020ca2eff6e93fc59cd39de0be8f14 /test | |
| parent | a8891634d32ad9556921faed2707fb304304c900 (diff) | |
| parent | fb66900a9ab7729d22aa83a0e60cb80ec8e642c6 (diff) | |
Merge pull request #14052 from mehrdada/legacyepoll
Explicitly enable epoll1 on manylinux1
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/iomgr/ev_epollsig_linux_test.cc | 6 | ||||
| -rw-r--r-- | test/core/iomgr/pollset_set_test.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index e767e01f21..262470300e 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -18,7 +18,7 @@ #include "src/core/lib/iomgr/port.h" /* This test only relevant on linux systems where epoll() is available */ -#ifdef GRPC_LINUX_EPOLL +#ifdef GRPC_LINUX_EPOLL_CREATE1 #include "src/core/lib/iomgr/ev_epollsig_linux.h" #include "src/core/lib/iomgr/ev_posix.h" @@ -319,6 +319,6 @@ int main(int argc, char** argv) { grpc_shutdown(); return 0; } -#else /* defined(GRPC_LINUX_EPOLL) */ +#else /* defined(GRPC_LINUX_EPOLL_CREATE1) */ int main(int argc, char** argv) { return 0; } -#endif /* !defined(GRPC_LINUX_EPOLL) */ +#endif /* !defined(GRPC_LINUX_EPOLL_CREATE1) */ diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc index f27079134b..7d2f59bed4 100644 --- a/test/core/iomgr/pollset_set_test.cc +++ b/test/core/iomgr/pollset_set_test.cc @@ -18,7 +18,7 @@ #include "src/core/lib/iomgr/port.h" /* This test only relevant on linux systems where epoll is available */ -#ifdef GRPC_LINUX_EPOLL +#ifdef GRPC_LINUX_EPOLL_CREATE1 #include <errno.h> #include <string.h> @@ -443,6 +443,6 @@ int main(int argc, char** argv) { grpc_shutdown(); return 0; } -#else /* defined(GRPC_LINUX_EPOLL) */ +#else /* defined(GRPC_LINUX_EPOLL_CREATE1) */ int main(int argc, char** argv) { return 0; } -#endif /* !defined(GRPC_LINUX_EPOLL) */ +#endif /* !defined(GRPC_LINUX_EPOLL_CREATE1) */ |