From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Wed, 13 Oct 2021 00:35:24 +0000 (+0800)
Subject: test/librbd: re-enable BlockGuard test.
X-Git-Tag: v17.1.0~79^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43494%2Fhead;p=ceph.git

test/librbd: re-enable BlockGuard test.

This patch partly revert PR#16255.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index a110016efd2..df6e8c5e92d 100644
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -11,7 +11,6 @@ set(librbd_test
   test_ImageWatcher.cc
   test_internal.cc
   test_mirroring.cc
-  test_BlockGuard.cc
   test_DeepCopy.cc
   test_Groups.cc
   test_Migration.cc
@@ -41,6 +40,7 @@ target_link_libraries(rbd_test_mock PUBLIC
 # 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_main.cc
   test_mock_fixture.cc
   test_mock_ConfigWatcher.cc