From: Daniel Gryniewicz <dang@redhat.com>
Date: Wed, 18 Jun 2025 17:03:12 +0000 (-0400)
Subject: Merge pull request #61850 from AliMasarweh/wip-alimasa-rgw-standalone
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=df5c005dd4e8316eacf5967c3de487bfccc9337f;p=ceph.git

Merge pull request #61850 from AliMasarweh/wip-alimasa-rgw-standalone

RGW/standalone: Build without RadosStore
---

df5c005dd4e8316eacf5967c3de487bfccc9337f
diff --cc src/test/rgw/CMakeLists.txt
index a8e5896316a6a,f9305c5afc625..5899e8dca1375
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@@ -387,20 -398,23 +398,21 @@@ target_link_libraries(ceph_test_datalo
    ${UNITTEST_LIBS}
    ${rgw_libs})
  install(TARGETS ceph_test_datalog DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
  
 -if(WITH_CATCH2)
 - add_executable(unittest_rgw_hex
 -  test_rgw_hex.cc)
 +#
 +# Helper for adding RGW tests built with Catch2:
 +# Note: to define a test that does not use Catch2::main(), use:
 +#   add_catch2_test_rgw(my_test_name NO_CATCH2_MAIN)
 +# ...your test should be in a file called "test_<my_test_name>.cc (ex. "test_foo.cc")
 +# and the output will be called "unittest_my_test_name".
 +#
 +function(add_catch2_test_rgw test_name)
 +add_catch2_test(${test_name}
 + ${ARGV1}
 + EXTRA_LIBS rgw_common ${rgw_libs}
 + EXTRA_INCS "SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src/rgw")
 +endfunction()
 +
 +add_catch2_test_rgw(rgw_hex)
  
 - target_include_directories(unittest_rgw_hex
 -  SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw")
 -
 - target_link_libraries(unittest_rgw_hex 
 -  rgw_common
 -  librados
 -  ceph-common
 -  ${rgw_libs}
 -  ${EXTRALIBS}
 -  Catch2WithMain)
 -
 - add_ceph_unittest(unittest_rgw_hex)
 -
 -endif(WITH_CATCH2)