Merge pull request ceph#60547 from MaxKellermann/without_bluestore

Fix two build failures with `WITH_BLUESTORE=no`

Author: aclamk

src/test/CMakeLists.txt

@@ -168,7 +168,7 @@ add_executable(ceph_test_mutate
 target_link_libraries(ceph_test_mutate global librados ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS})
 
-if(NOT WIN32)
+if(WITH_BLUESTORE AND NOT WIN32)
 # test_trans
 add_executable(test_trans
   test_trans.cc

src/test/objectstore/store_test.cc

@@ -200,6 +200,7 @@ class StoreTestDeferredSetup : public StoreTest {
   }
 };
 
+#ifdef WITH_BLUESTORE
 
 class MultiLabelTest : public StoreTestDeferredSetup {
   public:
@@ -275,6 +276,8 @@ class MultiLabelTest : public StoreTestDeferredSetup {
   }
 };
 
+#endif // WITH_BLUESTORE
+
 class StoreTestSpecificAUSize : public StoreTestDeferredSetup {
 
 public:
@@ -7199,14 +7202,15 @@ INSTANTIATE_TEST_SUITE_P(
   StoreTestDeferredSetup,
   ::testing::Values(
     "bluestore"));
-#endif
 
 INSTANTIATE_TEST_SUITE_P(
   ObjectStore,
   MultiLabelTest,
   ::testing::Values(
     "bluestore"));
 
+#endif // WITH_BLUESTORE
+
 struct deferred_test_t {
   uint32_t bdev_block_size;
   uint32_t min_alloc_size;
@@ -7220,6 +7224,8 @@ void PrintTo(const deferred_test_t& t, ::std::ostream* os)
       << t.max_blob_size << "/" << t.prefer_deferred_size;
 }
 
+#ifdef WITH_BLUESTORE
+
 class DeferredWriteTest : public StoreTestFixture,
 		          public ::testing::WithParamInterface<deferred_test_t> {
 public:
@@ -7310,7 +7316,6 @@ TEST_P(DeferredWriteTest, NewData) {
   }
 }
 
-#if defined(WITH_BLUESTORE)
 INSTANTIATE_TEST_SUITE_P(
   BlueStore,
   DeferredWriteTest,
@@ -10971,6 +10976,8 @@ TEST_P(StoreTest, mergeRegionTest) {
   }
 }
 
+#ifdef WITH_BLUESTORE
+
 TEST_P(MultiLabelTest, MultiSelectableOff) {
   SetVal(g_conf(), "bluestore_bdev_label_multi", "false");
   g_conf().apply_changes(nullptr);
@@ -11293,6 +11300,8 @@ TEST_P(MultiLabelTest, UpgradeToMultiLabelCollisionWithObjects) {
   ASSERT_EQ(label.meta["multi"], "yes");
 }
 
+#endif // WITH_BLUESTORE
+
 TEST_P(StoreTestSpecificAUSize, BluestoreEnforceHWSettingsHdd) {
   if (string(GetParam()) != "bluestore")
     return;