From: Kefu Chai <kchai@redhat.com>
Date: Wed, 9 Dec 2020 09:42:43 +0000 (+0800)
Subject: test/crimson: do not link against crimson-{os,common}
X-Git-Tag: v16.1.0~305^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81559811ded83d85cbdc7fd3b7a491602258bd37;p=ceph.git

test/crimson: do not link against crimson-{os,common}

this change partially reverts 652dbacc7424efbd3c3175de8ba79ed29edd55c8
quite a few test does not use crimson-os at all, so no need to link
against this library.

even worse is that crimson-os contains crimson-seastore *and*
crimson-alienstore. this introduces cyclic references.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/os/seastore/CMakeLists.txt b/src/crimson/os/seastore/CMakeLists.txt
index 5a764f19cc3b..1632e98babdc 100644
--- a/src/crimson/os/seastore/CMakeLists.txt
+++ b/src/crimson/os/seastore/CMakeLists.txt
@@ -34,6 +34,4 @@ add_library(crimson-seastore STATIC
   ../../../test/crimson/seastore/test_block.cc
 	)
 target_link_libraries(crimson-seastore
-  crimson
-  crimson-os)
-
+  crimson)
diff --git a/src/test/crimson/seastore/CMakeLists.txt b/src/test/crimson/seastore/CMakeLists.txt
index 34a3721895dc..73feebe23c2b 100644
--- a/src/test/crimson/seastore/CMakeLists.txt
+++ b/src/test/crimson/seastore/CMakeLists.txt
@@ -6,9 +6,7 @@ add_ceph_unittest(unittest-transaction-manager)
 target_link_libraries(
   unittest-transaction-manager
   ${CMAKE_DL_LIBS}
-  crimson-seastore
-  crimson-os
-  crimson-common)
+  crimson-seastore)
 
 add_executable(unittest-btree-lba-manager
   test_btree_lba_manager.cc
@@ -17,9 +15,7 @@ add_ceph_unittest(unittest-btree-lba-manager)
 target_link_libraries(
   unittest-btree-lba-manager
   ${CMAKE_DL_LIBS}
-  crimson-seastore
-  crimson-os
-  crimson-common)
+  crimson-seastore)
 
 add_executable(unittest-seastore-journal
   test_seastore_journal.cc)
@@ -28,9 +24,7 @@ add_ceph_test(unittest-seastore-journal
 target_link_libraries(
   unittest-seastore-journal
   crimson::gtest
-  crimson-seastore
-  crimson-os
-  crimson-common)
+  crimson-seastore)
 
 add_executable(unittest-seastore-cache
   test_block.cc
@@ -40,9 +34,7 @@ add_ceph_test(unittest-seastore-cache
 target_link_libraries(
   unittest-seastore-cache
   crimson::gtest
-  crimson-seastore
-  crimson-os
-  crimson-common)
+  crimson-seastore)
 
 add_executable(unittest-extmap-manager
   test_extmap_manager.cc
diff --git a/src/test/crimson/seastore/onode_tree/CMakeLists.txt b/src/test/crimson/seastore/onode_tree/CMakeLists.txt
index 5947d8a68f0c..1f4718db067e 100644
--- a/src/test/crimson/seastore/onode_tree/CMakeLists.txt
+++ b/src/test/crimson/seastore/onode_tree/CMakeLists.txt
@@ -3,9 +3,7 @@ add_executable(test-seastore-onode-tree-node
 add_ceph_unittest(test-seastore-onode-tree-node)
 target_link_libraries(test-seastore-onode-tree-node
   crimson-seastore
-  GTest::Main
-  crimson-os
-  crimson-common)
+  GTest::Main)
 
 add_executable(unittest-staged-fltree
   test_staged_fltree.cc