From a5f690fe287196ba20eb6a9cb1edb5423b3775a5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 14 Aug 2021 10:25:25 +0800 Subject: [PATCH] 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 --- src/test/objectstore/Allocator_aging_fragmentation.cc | 2 +- src/test/osd/TestOSDMap.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/objectstore/Allocator_aging_fragmentation.cc b/src/test/objectstore/Allocator_aging_fragmentation.cc index 57ad8bd902e..e0b27fd67c6 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 b146d3c4f72..cc095cbf26c 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( -- 2.47.3