From fe673ea86b6fa345c40959370c7b09064caf9f6e Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Mon, 1 Feb 2016 19:26:00 -0500 Subject: [PATCH] cmake: moved tests into test/cls_rbd dir Added a CMakeLists.txt into test/cls_rbd. Signed-off-by: Ali Maredia --- src/test/CMakeLists.txt | 24 +----------------------- src/test/cls_rbd/CMakeLists.txt | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 src/test/cls_rbd/CMakeLists.txt diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 35f27d6bf1c1e..21e637e3e6cf8 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -7,6 +7,7 @@ add_subdirectory(cls_hello) add_subdirectory(cls_lock) add_subdirectory(cls_log) add_subdirectory(cls_numops) +add_subdirectory(cls_rbd) # test_timers add_executable(ceph_test_timers @@ -392,29 +393,6 @@ target_link_libraries(test_librbd_fsx keyutils ) -add_executable(ceph_test_cls_rbd - cls_rbd/test_cls_rbd.cc - ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc - ${CMAKE_SOURCE_DIR}/src/common/secret.c - ) -set_target_properties(ceph_test_cls_rbd PROPERTIES COMPILE_FLAGS - ${UNITTEST_CXX_FLAGS}) -target_link_libraries(ceph_test_cls_rbd - librbd - cls_rbd - cls_lock - librados - global - ${UNITTEST_LIBS} - ${CMAKE_DL_LIBS} - ${CRYPTO_LIBS} - ${EXTRALIBS} - radostest - blkid - udev - keyutils - ) - add_executable(ceph_test_cls_refcount cls_refcount/test_cls_refcount.cc ) diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt new file mode 100644 index 0000000000000..ac6029b8ea4f4 --- /dev/null +++ b/src/test/cls_rbd/CMakeLists.txt @@ -0,0 +1,24 @@ +# cls_test_cls_rbd +add_executable(ceph_test_cls_rbd + test_cls_rbd.cc + ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc + ${CMAKE_SOURCE_DIR}/src/common/secret.c + ) +set_target_properties(ceph_test_cls_rbd PROPERTIES COMPILE_FLAGS + ${UNITTEST_CXX_FLAGS}) +target_link_libraries(ceph_test_cls_rbd + librbd + cls_rbd + cls_lock + librados + global + ${UNITTEST_LIBS} + ${CMAKE_DL_LIBS} + ${CRYPTO_LIBS} + ${EXTRALIBS} + radostest + blkid + udev + keyutils + ) + -- 2.39.5