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 <kchai@redhat.com>

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index ee0392f89be6bb9c85516c25eff85153dda920aa..468d1150f7a04c38f7890455913cf99f99305eb5 100644 (file)
--- 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 01b4ac35d0004d4138d86f003c66833cd5295a70..fa4a526afa0de157a3ba1624b3de1b3844d6023e 100644 (file)
--- 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 ef2b6458e288c922e26ac7120ccca6b8c13c3ca7..75e3ead606720d254b88a883cc6400486d20c2f4 100644 (file)
--- 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 e4d8a9f266e4ee9321fa0a78f85f1269a64b8540..a91137648effec8825e1a8a349182098bad54b59 100644 (file)
--- 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 51f063d1706619aa97d0068f9348399e15ca57ef..86c73bde7f3969ec5b3b5aac40854b6e81f3f690 100644 (file)
--- 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 ebbdfb7dc4f5c7f806492dd0ed38945f09e3590d..ab036315d083292e5c0edb1ff5a34b435ac451f4 100644 (file)
--- 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 3f44d85d1f2f9f2bbcfa6471991b9e4cfa81ee80..b2e511ea51d4aee623a67c4f13a469d827f8f9a2 100644 (file)
--- 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 5ae2bebb55438a39bb8583f0b6a64dcc9fe7c5d0..83e715509b95d7eed3cfe56cdebbe62d79b51b25 100644 (file)
--- 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 492f686e0dd68c9f045484ca9cca6169a72b88b8..4f570bb1eb57a90e08f18f50708c06f9417d4caf 100644 (file)
--- 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 ea902443973fe038c436a43986416719969740b7..fa3d1d0bc36b0bef1d4c5db500a8a52e2760b81b 100644 (file)
--- 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})