From f38314ed42e86b5c4510393c253925ea7b4c5111 Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Tue, 24 May 2022 17:19:28 +0000 Subject: [PATCH] test/objectstore: use GTEST_SKIP for smr If certain tests are smr=true, the test will be skipped with GTEST_SKIP instead of the original return message. Signed-off-by: Laura Flores (cherry picked from commit 162e9adda610b3badb3da72b4fb7567e7426c7fb) --- src/test/objectstore/store_test.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index e45d5543a108c..dd95a0bc10875 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -7340,8 +7340,7 @@ TEST_P(StoreTestSpecificAUSize, ZeroBlockDetectionSmallOverwrite) { GTEST_SKIP() << "not bluestore or bluestore_zero_block_detection=false, skipping"; } if (smr) { - cout << "SKIP" << std::endl; - return; + GTEST_SKIP() << "smr, skipping"; } size_t block_size = 65536; @@ -7521,8 +7520,7 @@ TEST_P(StoreTestSpecificAUSize, ZeroBlockDetectionBigOverwrite) { GTEST_SKIP() << "not bluestore or bluestore_zero_block_detection=false, skipping"; } if (smr) { - cout << "SKIP" << std::endl; - return; + GTEST_SKIP() << "smr, skipping"; } size_t block_size = 4096; -- 2.39.5