From 0c010520b337edb38a78bf936a7661185d93d7e9 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 13 Apr 2023 09:26:44 -0700 Subject: [PATCH] cmake/rgw: librgw tests depend on ALLOC_LIBS somehow this stops tcmalloc from crashing on ubuntu 20.04 Fixes: https://tracker.ceph.com/issues/59269 Signed-off-by: Casey Bodley (cherry picked from commit d5f97e6543906d5be898b24a1c10269ace309c76) --- src/test/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index eca4338af63..a6ff6606c52 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -281,6 +281,7 @@ target_link_libraries(ceph_test_librgw_file ceph-common ${UNITTEST_LIBS} ${EXTRALIBS} + ${ALLOC_LIBS} ) install(TARGETS ceph_test_librgw_file DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -294,6 +295,7 @@ target_link_libraries(ceph_test_librgw_file_cd ceph-common ${UNITTEST_LIBS} ${EXTRALIBS} + ${ALLOC_LIBS} ) install(TARGETS ceph_test_librgw_file_cd DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -307,6 +309,7 @@ target_link_libraries(ceph_test_librgw_file_gp ceph-common ${UNITTEST_LIBS} ${EXTRALIBS} + ${ALLOC_LIBS} ) install(TARGETS ceph_test_librgw_file_gp DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -325,6 +328,7 @@ target_link_libraries(ceph_test_librgw_file_nfsns ${UNITTEST_LIBS} ${EXTRALIBS} ${LUA_LIBRARIES} + ${ALLOC_LIBS} ) target_link_libraries(ceph_test_librgw_file_nfsns spawn) install(TARGETS ceph_test_librgw_file_nfsns DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -339,6 +343,7 @@ target_link_libraries(ceph_test_librgw_file_aw ceph-common ${UNITTEST_LIBS} ${EXTRALIBS} + ${ALLOC_LIBS} ) install(TARGETS ceph_test_librgw_file_aw DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -357,6 +362,7 @@ target_link_libraries(ceph_test_librgw_file_marker ${UNITTEST_LIBS} ${EXTRALIBS} ${LUA_LIBRARIES} + ${ALLOC_LIBS} ) target_link_libraries(ceph_test_librgw_file_marker spawn) install(TARGETS ceph_test_librgw_file_marker DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -375,6 +381,7 @@ target_link_libraries(ceph_test_librgw_file_xattr ${UNITTEST_LIBS} ${EXTRALIBS} ${LUA_LIBRARIES} + ${ALLOC_LIBS} ) target_link_libraries(ceph_test_librgw_file_xattr spawn) -- 2.47.3