From: Kefu Chai Date: Sat, 14 Aug 2021 02:25:25 +0000 (+0800) Subject: test: s/INSTANTIATE_TEST_CASE_P/INSTANTIATE_TEST_SUITE_P/ X-Git-Tag: v17.1.0~1117^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42778%2Fhead;p=ceph.git test: s/INSTANTIATE_TEST_CASE_P/INSTANTIATE_TEST_SUITE_P/ to silence warnings like: ../src/test/osd/TestOSDMap.cc:2076:1: warning: 'InstantiateTestCase_P_IsDeprecated' is deprecated: INSTANTIATE_TEST_CASE_P is deprecated, please use INSTANTIATE_TEST_SUITE_P [-Wdeprecated-declarations] INSTANTIATE_TEST_CASE_P( ^ ../src/googletest/googletest/include/gtest/gtest-param-test.h:505:38: note: expanded from macro 'INSTANTIATE_TEST_CASE_P' static_assert(::testing::internal::InstantiateTestCase_P_IsDeprecated(), \ ^ ../src/googletest/googletest/include/gtest/internal/gtest-internal.h:1298:1: note: 'InstantiateTestCase_P_IsDeprecated' has been explicitly marked deprecated here GTEST_INTERNAL_DEPRECATED( ^ ../src/googletest/googletest/include/gtest/internal/gtest-port.h:2249:59: note: expanded from macro 'GTEST_INTERNAL_DEPRECATED' #define GTEST_INTERNAL_DEPRECATED(message) __attribute__((deprecated(message))) ^ 1 warning generated. Signed-off-by: Kefu Chai --- diff --git a/src/test/objectstore/Allocator_aging_fragmentation.cc b/src/test/objectstore/Allocator_aging_fragmentation.cc index 57ad8bd902ee..e0b27fd67c65 100755 --- a/src/test/objectstore/Allocator_aging_fragmentation.cc +++ b/src/test/objectstore/Allocator_aging_fragmentation.cc @@ -456,7 +456,7 @@ TEST_P(AllocTest, test_bonus_empty_fragmented) std::cout << " empty storage frag.score=" << frag_score << std::endl; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Allocator, AllocTest, ::testing::Values("stupid", "bitmap", "avl", "btree")); diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc index b146d3c4f728..cc095cbf26c5 100644 --- a/src/test/osd/TestOSDMap.cc +++ b/src/test/osd/TestOSDMap.cc @@ -2073,7 +2073,7 @@ TEST_P(OSDMapTest, BUG_51842) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OSDMap, OSDMapTest, ::testing::Values(