diff options
| author |  Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2018-06-25 13:37:36 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-25 13:37:36 -0700 |
| commit | e0198fce70c3f79475f63860af7c46840496765d (patch) | |
| tree | 36e7995f3a8fd7d2e2a4de26b1bbfa7b03dbbb36 /CMakeLists.txt | |
| parent | 618a3f561d4a93f263cca23abad086ed8f4d5e86 (diff) | |
| parent | afbc251b1a12a09c9aa030930c524da5b5b3df41 (diff) | |
Merge pull request #15776 from sreecha/epollex-ownerfd-fix
Prevent pollable from accessing a potentially orphaned/destroyed fd
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 34adc3e7b3..0d1b201f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -246,6 +246,9 @@ endif() add_dependencies(buildtests_c endpoint_pair_test) add_dependencies(buildtests_c error_test) if(_gRPC_PLATFORM_LINUX) +add_dependencies(buildtests_c ev_epollex_linux_test) +endif() +if(_gRPC_PLATFORM_LINUX) add_dependencies(buildtests_c ev_epollsig_linux_test) endif() add_dependencies(buildtests_c fake_resolver_test) @@ -6186,6 +6189,37 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) +add_executable(ev_epollex_linux_test + test/core/iomgr/ev_epollex_linux_test.cc +) + + +target_include_directories(ev_epollex_linux_test + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include + PRIVATE ${_gRPC_SSL_INCLUDE_DIR} + PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} + PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} + PRIVATE ${_gRPC_CARES_INCLUDE_DIR} + PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} + PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + PRIVATE ${_gRPC_NANOPB_INCLUDE_DIR} +) + +target_link_libraries(ev_epollex_linux_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr_test_util + gpr +) + +endif() +endif (gRPC_BUILD_TESTS) +if (gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX) + add_executable(ev_epollsig_linux_test test/core/iomgr/ev_epollsig_linux_test.cc ) |