From: Kefu Chai <kchai@redhat.com>
Date: Mon, 27 Jun 2016 04:20:29 +0000 (+0800)
Subject: cmake: add missing bits for rados/test.sh
X-Git-Tag: ses5-milestone5~586^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6289b6a0dfeab69b51eded2c30837004158de842;p=ceph.git

cmake: add missing bits for rados/test.sh

some executables named ceph_test_rados_* are missing in the ceph-test
package. and they are called by rados/test.sh.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
index 014da7d7c9ab8..964af6a1d76cd 100644
--- a/src/test/librados/CMakeLists.txt
+++ b/src/test/librados/CMakeLists.txt
@@ -151,6 +151,22 @@ set_target_properties(ceph_test_rados_api_tmap_migrate PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(ceph_test_rados_api_tmap_migrate
   librados mds osdc global cls_cephfs_client ${UNITTEST_LIBS} radostest)
+install(TARGETS
+  ceph_test_rados_api_aio
+  ceph_test_rados_api_c_read_operations
+  ceph_test_rados_api_c_write_operations
+  ceph_test_rados_api_cmd
+  ceph_test_rados_api_io
+  ceph_test_rados_api_list
+  ceph_test_rados_api_lock
+  ceph_test_rados_api_misc
+  ceph_test_rados_api_pool
+  ceph_test_rados_api_snapshots
+  ceph_test_rados_api_stat
+  ceph_test_rados_api_tier
+  ceph_test_rados_api_tmap_migrate
+  ceph_test_rados_api_watch_notify
+  DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # unittest_librados
 add_executable(unittest_librados
diff --git a/src/test/system/CMakeLists.txt b/src/test/system/CMakeLists.txt
index 699643b9f3cc7..f59ed3e79c632 100644
--- a/src/test/system/CMakeLists.txt
+++ b/src/test/system/CMakeLists.txt
@@ -12,19 +12,20 @@ set(libsystest_srcs
 add_library(systest STATIC ${libsystest_srcs})
 
 # test_rados_list_parallel
-add_executable(test_rados_list_parallel
+add_executable(ceph_test_rados_list_parallel
   rados_list_parallel.cc
   )
-target_link_libraries(test_rados_list_parallel librados systest global pthread
+target_link_libraries(ceph_test_rados_list_parallel librados systest global pthread
   rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
 
 # test_rados_open_pools_parallel
 set(test_rados_open_pools_parallel_srcs 
   rados_open_pools_parallel.cc)
-add_executable(test_rados_open_pools_parallel
+add_executable(ceph_test_rados_open_pools_parallel
   ${test_rados_open_pools_parallel_srcs}
   )
-target_link_libraries(test_rados_open_pools_parallel librados systest global
+target_link_libraries(ceph_test_rados_open_pools_parallel
+  librados systest global
   pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
 
 # test_rados_delete_pools_parallel
@@ -39,8 +40,6 @@ add_executable(ceph_test_rados_delete_pools_parallel
   )
 target_link_libraries(ceph_test_rados_delete_pools_parallel librados systest global
   pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
-install(TARGETS ceph_test_rados_delete_pools_parallel
-  DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # test_rados_watch_notify
 set(test_rados_watch_notify_srcs
@@ -51,9 +50,16 @@ set(test_rados_watch_notify_srcs
   st_rados_watch.cc
   st_rados_notify.cc
   )
-add_executable(test_rados_watch_notify
+add_executable(ceph_test_rados_watch_notify
   ${test_rados_watch_notify_srcs}
   )
-target_link_libraries(test_rados_watch_notify librados systest global
+target_link_libraries(ceph_test_rados_watch_notify
+  librados systest global
   pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
 
+install(TARGETS
+  ceph_test_rados_delete_pools_parallel
+  ceph_test_rados_list_parallel
+  ceph_test_rados_open_pools_parallel
+  ceph_test_rados_watch_notify
+  DESTINATION ${CMAKE_INSTALL_BINDIR})