cmake: add rbd-mirror executable to run-make-check

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit e2b46020317e4d4e37c281a6b1817711e0826a37)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0870323a943461912464021955167e51582d58e..a8206289b3a98cd63c17015b1e709e8879e76f4c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,6 +244,9 @@ if(WITH_BLUESTORE_PMEM)
   set(HAVE_LIBDML ${DML_FOUND})
 endif()
 
+CMAKE_DEPENDENT_OPTION(WITH_RBD_MIRROR "Enable build for rbd-mirror daemon executable" OFF
+    "WITH_RBD" OFF)
+
 CMAKE_DEPENDENT_OPTION(WITH_RBD_MIGRATION_FORMAT_QCOW_V1
   "Enable librbd QCOW v1 migration format support" ON
   "WITH_RBD" OFF)

diff --git a/run-make-check.sh b/run-make-check.sh
index a67145a4d28948038284405e52c5b4f0d81de4d7..f425c85145ca6b55b2b3d01d111076c8268fbcc9 100755 (executable)
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -91,6 +91,7 @@ function main() {
     cmake_opts+=" -DWITH_GRAFANA=ON"
     cmake_opts+=" -DWITH_SPDK=ON"
     cmake_opts+=" -DWITH_RADOSGW_MOTR=ON"
+    cmake_opts+=" -DWITH_RBD_MIRROR=ON"
     if [ $WITH_SEASTAR ]; then
         cmake_opts+=" -DWITH_SEASTAR=ON"
     fi

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 54c49970ebc6772929ae29feb51bed9a3661fafd..308c0e0170a233ae2c9fe1e0e7b15101763979cf 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -575,6 +575,9 @@ if(WITH_RBD)
   if(FREEBSD)
     add_dependencies(tests rbd-ggate)
   endif(FREEBSD)
+  if(WITH_RBD_MIRROR)
+    add_dependencies(tests unittest_librbd rbd-mirror)
+  endif(WITH_RBD_MIRROR)
 endif(WITH_RBD)
 if(WITH_RADOSGW)
   add_dependencies(tests radosgwd radosgw-admin)

diff --git a/src/tools/rbd_mirror/CMakeLists.txt b/src/tools/rbd_mirror/CMakeLists.txt
index f260d978632a456afbd3986e74c9823c13558541..43a6f03fe960aa7f53a553cc979632655f662fc5 100644 (file)
--- a/src/tools/rbd_mirror/CMakeLists.txt
+++ b/src/tools/rbd_mirror/CMakeLists.txt
@@ -87,4 +87,5 @@ target_link_libraries(rbd-mirror
   heap_profiler
   ${ALLOC_LIBS}
   OpenSSL::SSL)
-install(TARGETS rbd-mirror DESTINATION bin)
+install(TARGETS rbd-mirror
+        DESTINATION ${CMAKE_INSTALL_BINDIR})