From d8ea79e23232e0a1057e945df7bd48a57c0da930 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Tue, 13 Sep 2022 14:18:55 +0000 Subject: [PATCH] test: disable unsupported tests on Windows ceph_test_c2c will run until being signaled. However, we have limited signal support on Windows, which is why we're going to skip it for now. At the same time, "fork" is unavailable on Windows, so we'll have to temporarily disable the libcephfs reclaim test. Signed-off-by: Lucian Petrut --- src/test/CMakeLists.txt | 3 +++ src/test/libcephfs/CMakeLists.txt | 23 +++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 61b4641c86642..ddd5034344c8e 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -490,6 +490,8 @@ install(TARGETS ceph_test_stress_watch DESTINATION ${CMAKE_INSTALL_BINDIR}) +# limited Windows signal support, skipped for now +if(NOT WIN32) add_executable(ceph_test_c2c test_c2c.cc ) @@ -503,6 +505,7 @@ target_link_libraries(ceph_test_c2c install(TARGETS ceph_test_c2c DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(NOT WIN32) if(WITH_FUSE) add_executable(ceph_test_cfuse_cache_invalidate diff --git a/src/test/libcephfs/CMakeLists.txt b/src/test/libcephfs/CMakeLists.txt index cc627cfd76ea9..b6cd08e601c01 100644 --- a/src/test/libcephfs/CMakeLists.txt +++ b/src/test/libcephfs/CMakeLists.txt @@ -36,17 +36,20 @@ if(WITH_LIBCEPHFS) install(TARGETS ceph_test_libcephfs_newops DESTINATION ${CMAKE_INSTALL_BINDIR}) - add_executable(ceph_test_libcephfs_reclaim - reclaim.cc - ) - target_link_libraries(ceph_test_libcephfs_reclaim - cephfs - ${UNITTEST_LIBS} - ${EXTRALIBS} - ${CMAKE_DL_LIBS} + # uses fork, not available on Windows + if(NOT WIN32) + add_executable(ceph_test_libcephfs_reclaim + reclaim.cc ) - install(TARGETS ceph_test_libcephfs_reclaim - DESTINATION ${CMAKE_INSTALL_BINDIR}) + target_link_libraries(ceph_test_libcephfs_reclaim + cephfs + ${UNITTEST_LIBS} + ${EXTRALIBS} + ${CMAKE_DL_LIBS} + ) + install(TARGETS ceph_test_libcephfs_reclaim + DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif(NOT WIN32) add_executable(ceph_test_libcephfs_lazyio lazyio.cc -- 2.39.5