Merge pull request ceph#62566 from tchaikov/neorados-googletest

neorados/test, googletest: adapt to googletest and bump up googletest submodule

Reviewed-by: Adam Emerson <[email protected]>

Author: tchaikov

src/CMakeLists.txt

@@ -764,7 +764,7 @@ add_subdirectory(erasure-code)
 if(WITH_TESTS)
   option(WITH_SYSTEM_GTEST "require and build with system gtest and gmock" OFF)
   if(WITH_SYSTEM_GTEST)
-    find_package(GTest REQUIRED)
+    find_package(GTest 1.13.0 REQUIRED)
     find_package(GMock REQUIRED)
   else()
     set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)

src/googletest

@@ -396,18 +396,15 @@ class NeoRadosECTest : public NeoRadosTestBase {
 		"test_suite_name must not be empty");                          \
   static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                       \
 		"test_name must not be empty");                                \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) : public fixture {  \
+  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
+    : public fixture, private ::testing::internal::GTestNonCopyable {          \
   public:                                                                      \
     GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;            \
     ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default;  \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
-							   test_name));        \
-    GTEST_DISALLOW_MOVE_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
-							   test_name));        \
 									       \
   private:                                                                     \
     boost::asio::awaitable<void> CoTestBody() override;                        \
-    static ::testing::TestInfo *const test_info_ GTEST_ATTRIBUTE_UNUSED_;      \
+    [[maybe_unused]] static ::testing::TestInfo *const test_info_;             \
   };                                                                           \
 									       \
   ::testing::TestInfo *const GTEST_TEST_CLASS_NAME_(test_suite_name,           \