From: Ali Maredia <amaredia@redhat.com>
Date: Mon, 8 Feb 2016 17:30:45 +0000 (-0500)
Subject: cmake: Added new unittests to make check
X-Git-Tag: v10.0.4~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51a15726fce48ef412298642aa6cb5d2b153a545;p=ceph.git

cmake: Added new unittests to make check

Added unittest_shunique_lock & unittest_mutex_debug
to make check, and made them link ALLOC_LIBS

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 5675e093f60c..40707f85e5b3 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -545,12 +545,14 @@ set_target_properties(unittest_str_map
 set(unittest_mutex_debug_srcs
   common/test_mutex_debug.cc
   )
-add_executable(unittest_mutex_debug
+add_executable(unittest_mutex_debug EXCLUDE_FROM_ALL
   ${unittest_mutex_debug_srcs}
   $<TARGET_OBJECTS:heap_profiler_objs>
   )
+add_test(unittest_mutex_debug unittest_mutex_debug)
+add_dependencies(check unittest_mutex_debug)
 target_link_libraries(unittest_mutex_debug global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
 set_target_properties(unittest_mutex_debug
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
@@ -558,12 +560,14 @@ set_target_properties(unittest_mutex_debug
 set(unittest_shunique_lock_srcs
   common/test_shunique_lock.cc
   )
-add_executable(unittest_shunique_lock
+add_executable(unittest_shunique_lock EXCLUDE_FROM_ALL
   ${unittest_shunique_lock_srcs}
   $<TARGET_OBJECTS:heap_profiler_objs>
   )
+add_test(unittest_shunique_lock unittest_shunique_lock)
+add_dependencies(check unittest_shunique_lock)
 target_link_libraries(unittest_shunique_lock global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
 set_target_properties(unittest_shunique_lock
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})