From: Kefu Chai Date: Wed, 8 Jun 2016 18:49:14 +0000 (+0800) Subject: cmake: install some of ceph_test_* and more tests X-Git-Tag: v11.0.0~130^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a761f9d53b0ed6d02a4edb78352a5843738e32a;p=ceph.git cmake: install some of ceph_test_* and more tests they are used by qa units and some other ceph-qa-suite tasks. Signed-off-by: Kefu Chai --- diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index ee0392f89be6..468d1150f7a0 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -162,12 +162,12 @@ if(${WITH_RADOSGW}) set_target_properties(test_cors PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS}) - # test_cls_rgw_meta + # ceph_test_cls_rgw_meta set(test_cls_rgw_meta_srcs test_rgw_admin_meta.cc) - add_executable(test_cls_rgw_meta + add_executable(ceph_test_cls_rgw_meta ${test_cls_rgw_meta_srcs} ) - target_link_libraries(test_cls_rgw_meta + target_link_libraries(ceph_test_cls_rgw_meta librados rgw_a global @@ -183,17 +183,21 @@ if(${WITH_RADOSGW}) ${Boost_REGEX_LIBRARY} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS} ${CRYPTO_LIBS}) - set_target_properties(test_cls_rgw_meta PROPERTIES COMPILE_FLAGS - ${UNITTEST_CXX_FLAGS}) + set_target_properties(ceph_test_cls_rgw_meta PROPERTIES + COMPILE_FLAGS ${UNITTEST_CXX_FLAGS}) + + install(TARGETS + ceph_test_cls_rgw_meta + DESTINATION ${CMAKE_INSTALL_BINDIR}) - # test_cls_rgw_log - set(test_cls_rgw_log_srcs + # ceph_test_cls_rgw_log + set(ceph_test_cls_rgw_log_srcs test_rgw_admin_log.cc ) - add_executable(test_cls_rgw_log - ${test_cls_rgw_log_srcs} + add_executable(ceph_test_cls_rgw_log + ${ceph_test_cls_rgw_log_srcs} ) - target_link_libraries(test_cls_rgw_log + target_link_libraries(ceph_test_cls_rgw_log librados rgw_a global @@ -213,15 +217,15 @@ if(${WITH_RADOSGW}) ${EXTRALIBS} ${CRYPTO_LIBS} ) - set_target_properties(test_cls_rgw_log PROPERTIES COMPILE_FLAGS + set_target_properties(ceph_test_cls_rgw_log PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS}) - # test_cls_rgw_opstate - set(test_cls_rgw_opstate_srcs test_rgw_admin_opstate.cc) - add_executable(test_cls_rgw_opstate - ${test_cls_rgw_opstate_srcs} + # ceph_test_cls_rgw_opstate + set(ceph_test_cls_rgw_opstate_srcs test_rgw_admin_opstate.cc) + add_executable(ceph_test_cls_rgw_opstate + ${ceph_test_cls_rgw_opstate_srcs} ) - target_link_libraries(test_cls_rgw_opstate + target_link_libraries(ceph_test_cls_rgw_opstate rgw_a librados cls_version_client @@ -241,8 +245,8 @@ if(${WITH_RADOSGW}) ${CRYPTO_LIBS} ${EXTRALIBS} ) - set_target_properties(test_cls_rgw_opstate PROPERTIES COMPILE_FLAGS - ${UNITTEST_CXX_FLAGS}) + set_target_properties(ceph_test_cls_rgw_opstate PROPERTIES + COMPILE_FLAGS ${UNITTEST_CXX_FLAGS}) # ceph_test_librgw_file (nfs-like RGW interface) add_executable(ceph_test_librgw_file @@ -428,6 +432,9 @@ target_link_libraries(ceph_test_stress_watch ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ) +install(TARGETS + ceph_test_stress_watch + DESTINATION ${CMAKE_INSTALL_BINDIR}) if(${HAVE_FUSE}) add_executable(ceph_test_cfuse_cache_invalidate diff --git a/src/test/cls_hello/CMakeLists.txt b/src/test/cls_hello/CMakeLists.txt index 01b4ac35d000..fa4a526afa0d 100644 --- a/src/test/cls_hello/CMakeLists.txt +++ b/src/test/cls_hello/CMakeLists.txt @@ -12,4 +12,6 @@ target_link_libraries(ceph_test_cls_hello radostest ${UNITTEST_LIBS} ) - +install(TARGETS + ceph_test_cls_hello + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/test/cls_lock/CMakeLists.txt b/src/test/cls_lock/CMakeLists.txt index ef2b6458e288..75e3ead60672 100644 --- a/src/test/cls_lock/CMakeLists.txt +++ b/src/test/cls_lock/CMakeLists.txt @@ -14,4 +14,6 @@ target_link_libraries(ceph_test_cls_lock ${EXTRALIBS} radostest ) - +install(TARGETS + ceph_test_cls_lock + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/test/cls_numops/CMakeLists.txt b/src/test/cls_numops/CMakeLists.txt index e4d8a9f266e4..a91137648eff 100644 --- a/src/test/cls_numops/CMakeLists.txt +++ b/src/test/cls_numops/CMakeLists.txt @@ -13,4 +13,6 @@ target_link_libraries(ceph_test_cls_numops radostest ${UNITTEST_LIBS} ) - +install(TARGETS + ceph_test_cls_numops + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt index 51f063d17066..86c73bde7f39 100644 --- a/src/test/cls_rbd/CMakeLists.txt +++ b/src/test/cls_rbd/CMakeLists.txt @@ -21,4 +21,6 @@ target_link_libraries(ceph_test_cls_rbd udev keyutils ) - +install(TARGETS + ceph_test_cls_rbd + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/test/cls_refcount/CMakeLists.txt b/src/test/cls_refcount/CMakeLists.txt index ebbdfb7dc4f5..ab036315d083 100644 --- a/src/test/cls_refcount/CMakeLists.txt +++ b/src/test/cls_refcount/CMakeLists.txt @@ -15,4 +15,6 @@ target_link_libraries(ceph_test_cls_refcount ${EXTRALIBS} radostest ) - +install(TARGETS + ceph_test_cls_refcount + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/test/libcephfs/CMakeLists.txt b/src/test/libcephfs/CMakeLists.txt index 3f44d85d1f2f..b2e511ea51d4 100644 --- a/src/test/libcephfs/CMakeLists.txt +++ b/src/test/libcephfs/CMakeLists.txt @@ -17,5 +17,7 @@ if(${WITH_CEPHFS}) ${EXTRALIBS} ${CMAKE_DL_LIBS} ) + install(TARGETS ceph_test_libcephfs + DESTINATION ${CMAKE_INSTALL_BINDIR}) endif(${WITH_CEPHFS}) diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt index 5ae2bebb5543..83e715509b95 100644 --- a/src/test/librbd/CMakeLists.txt +++ b/src/test/librbd/CMakeLists.txt @@ -143,3 +143,8 @@ target_link_libraries(ceph_test_librbd_fsx keyutils ) +install(TARGETS + ceph_test_librbd + ceph_test_librbd_api + ceph_test_librbd_fsx + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/test/mon/CMakeLists.txt b/src/test/mon/CMakeLists.txt index 492f686e0dd6..4f570bb1eb57 100644 --- a/src/test/mon/CMakeLists.txt +++ b/src/test/mon/CMakeLists.txt @@ -9,6 +9,8 @@ target_link_libraries(ceph_test_mon_workloadgen ${EXTRALIBS} ${CMAKE_DL_LIBS} ) +install(TARGETS ceph_test_mon_workloadgen + DESTINATION ${CMAKE_INSTALL_BINDIR}) # ceph_test_mon_msg add_executable(ceph_test_mon_msg diff --git a/src/test/osdc/CMakeLists.txt b/src/test/osdc/CMakeLists.txt index ea902443973f..fa3d1d0bc36b 100644 --- a/src/test/osdc/CMakeLists.txt +++ b/src/test/osdc/CMakeLists.txt @@ -8,4 +8,5 @@ target_link_libraries(ceph_test_objectcacher_stress ${EXTRALIBS} ${CMAKE_DL_LIBS} ) - +install(TARGETS ceph_test_objectcacher_stress + DESTINATION ${CMAKE_INSTALL_BINDIR})