]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: s/INSTANTIATE_TEST_CASE_P/INSTANTIATE_TEST_SUITE_P/ 42778/head
authorKefu Chai <kchai@redhat.com>
Sat, 14 Aug 2021 02:25:25 +0000 (10:25 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 14 Aug 2021 02:29:41 +0000 (10:29 +0800)
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 <kchai@redhat.com>
src/test/objectstore/Allocator_aging_fragmentation.cc
src/test/osd/TestOSDMap.cc

index 57ad8bd902ee4b0b2532b40309b4f964b191ea75..e0b27fd67c6574704a04cce772abdda3d7199a5e 100755 (executable)
@@ -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"));
index b146d3c4f72813039073645fdfa9966f6ba57714..cc095cbf26c5c84696ed8696609b72192fb5d9e6 100644 (file)
@@ -2073,7 +2073,7 @@ TEST_P(OSDMapTest, BUG_51842) {
     }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   OSDMap,
   OSDMapTest,
   ::testing::Values(