From: Kefu Chai <kchai@redhat.com>
Date: Fri, 3 Jun 2016 05:39:04 +0000 (+0800)
Subject: cmake: install binaries used by ceph-qa-suite
X-Git-Tag: v11.0.0~320^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=703e9c800cd7877078d2c76152f70dadd2a5430b;p=ceph.git

cmake: install binaries used by ceph-qa-suite

they are:
- ceph_test_rados: used by
  tasks/rados.py
- ceph_test_rados_delete_pools_parallel: used by
  suites/rados/monthrash/workloads/pool-create-delete.yaml
- ceph_test_filejournal
  suites/rados/objectstore/filejournal.yaml
- ceph_test_objectstore: used by
  suites/rados/objectstore/objectstore.yaml
- ceph_test_{async_driver,msgr}: used by
  suites/rados/singleton-nomsgr/all/msgr.yaml

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

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 07e83a1b4d70..ee0392f89be6 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -398,6 +398,9 @@ target_link_libraries(ceph_test_filejournal
   ${CMAKE_DL_LIBS}
   ${EXTRALIBS}
   )
+install(TARGETS
+  ceph_test_filejournal
+  DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # ceph_test_keys
 add_executable(ceph_test_keys
diff --git a/src/test/msgr/CMakeLists.txt b/src/test/msgr/CMakeLists.txt
index 78b78dc72044..4eb10acfa17a 100644
--- a/src/test/msgr/CMakeLists.txt
+++ b/src/test/msgr/CMakeLists.txt
@@ -27,6 +27,8 @@ set_target_properties(ceph_perf_msgr_client PROPERTIES COMPILE_FLAGS
 target_link_libraries(ceph_perf_msgr_client os global ${UNITTEST_LIBS})
 
 install(TARGETS
+  ceph_test_async_driver
+  ceph_test_msgr
   ceph_perf_msgr_server
   ceph_perf_msgr_client
-  DESTINATION bin)
+  DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/test/objectstore/CMakeLists.txt b/src/test/objectstore/CMakeLists.txt
index 233fffafa1e1..213549ab9df9 100644
--- a/src/test/objectstore/CMakeLists.txt
+++ b/src/test/objectstore/CMakeLists.txt
@@ -23,6 +23,8 @@ target_link_libraries(ceph_test_objectstore
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
   )
+install(TARGETS ceph_test_objectstore
+  DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 #ceph_test_keyvaluedb
 add_executable(ceph_test_keyvaluedb
diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt
index 1278675fc70d..8eabea8da2aa 100644
--- a/src/test/osd/CMakeLists.txt
+++ b/src/test/osd/CMakeLists.txt
@@ -13,6 +13,9 @@ target_link_libraries(ceph_test_rados
   ${EXTRALIBS}
   ${CMAKE_DL_LIBS}
   )
+install(TARGETS
+  ceph_test_rados
+  DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # scripts
 add_ceph_test(osd-bench.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-bench.sh) 
diff --git a/src/test/system/CMakeLists.txt b/src/test/system/CMakeLists.txt
index bd3a45b4ded5..699643b9f3cc 100644
--- a/src/test/system/CMakeLists.txt
+++ b/src/test/system/CMakeLists.txt
@@ -34,11 +34,13 @@ set(test_rados_delete_pools_parallel_srcs
   st_rados_delete_pool.cc
   st_rados_list_objects.cc
   )
-add_executable(test_rados_delete_pools_parallel
+add_executable(ceph_test_rados_delete_pools_parallel
   ${test_rados_delete_pools_parallel_srcs}
   )
-target_link_libraries(test_rados_delete_pools_parallel librados systest global
+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