From: Mykola Golub <mgolub@mirantis.com>
Date: Tue, 11 Jul 2017 11:26:17 +0000 (+0200)
Subject: test/librbd: re-enable internal tests in ceph_test_librbd
X-Git-Tag: v12.1.1~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16255%2Fhead;p=ceph.git

test/librbd: re-enable internal tests in ceph_test_librbd

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index 5dd47fcb74eb..a73f2e634bb0 100644
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -5,6 +5,8 @@ set(librbd_test
   test_ImageWatcher.cc
   test_internal.cc
   test_mirroring.cc
+  test_BlockGuard.cc
+  test_Groups.cc
   test_MirroringWatcher.cc
   test_ObjectMap.cc
   test_Operations.cc
@@ -23,8 +25,6 @@ set_target_properties(rbd_test_mock PROPERTIES COMPILE_FLAGS
 # unittest_librbd
 # doesn't use add_ceph_test because it is called by run-rbd-unit-tests.sh
 set(unittest_librbd_srcs
-  test_BlockGuard.cc
-  test_Groups.cc
   test_main.cc
   test_mock_fixture.cc
   test_mock_ExclusiveLock.cc
@@ -108,6 +108,7 @@ target_link_libraries(ceph_test_librbd
   rados_a
   ${UNITTEST_LIBS}
   radostest)
+target_compile_definitions(ceph_test_librbd PUBLIC "-DTEST_LIBRBD_INTERNALS")
 set_target_properties(ceph_test_librbd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})