From 53040e4c0e9e86710b8800dbb7ea15b3fa196ebf Mon Sep 17 00:00:00 2001
From: Brad Hubbard <bhubbard@redhat.com>
Date: Tue, 12 Oct 2021 11:51:48 +1000
Subject: [PATCH] nautilus: test/ceph_test_librgw_file*: Remove duplicate names

These multiple identical test signatures conflict and cause macro
expansion, and therefore the build, to fail.

Fixes: https://tracker.ceph.com/issues/52891

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---
 src/test/librgw_file.cc        | 2 +-
 src/test/librgw_file_aw.cc     | 2 +-
 src/test/librgw_file_cd.cc     | 2 +-
 src/test/librgw_file_gp.cc     | 2 +-
 src/test/librgw_file_marker.cc | 2 +-
 src/test/librgw_file_nfsns.cc  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/librgw_file.cc b/src/test/librgw_file.cc
index fea8a06119168..32e193eb5c7b6 100644
--- a/src/test/librgw_file.cc
+++ b/src/test/librgw_file.cc
@@ -202,7 +202,7 @@ TEST(LibRGW, GETATTR_OBJECTS) {
   }
 }
 
-TEST(LibRGW, CLEANUP) {
+TEST(LibRGW, CLEANUP1) {
   int ret = 0;
   using std::get;
 
diff --git a/src/test/librgw_file_aw.cc b/src/test/librgw_file_aw.cc
index ed51610cecf8f..b72cca75d4653 100644
--- a/src/test/librgw_file_aw.cc
+++ b/src/test/librgw_file_aw.cc
@@ -334,7 +334,7 @@ TEST(LibRGW, DELETE_OBJECT) {
   }
 }
 
-TEST(LibRGW, CLEANUP) {
+TEST(LibRGW, CLEANUP4) {
   int ret;
   if (object_fh) {
     ret = rgw_fh_rele(fs, object_fh, RGW_FH_RELE_FLAG_NONE);
diff --git a/src/test/librgw_file_cd.cc b/src/test/librgw_file_cd.cc
index b779f044d2003..c836330a71a64 100644
--- a/src/test/librgw_file_cd.cc
+++ b/src/test/librgw_file_cd.cc
@@ -119,7 +119,7 @@ TEST(LibRGW, DELETE_BUCKET_MULTI) {
   }
 }
 
-TEST(LibRGW, CLEANUP) {
+TEST(LibRGW, CLEANUP3) {
   // do nothing
 }
 
diff --git a/src/test/librgw_file_gp.cc b/src/test/librgw_file_gp.cc
index 1ad41cfd30f2c..047ae9db5a970 100644
--- a/src/test/librgw_file_gp.cc
+++ b/src/test/librgw_file_gp.cc
@@ -372,7 +372,7 @@ TEST(LibRGW, DELETE_OBJECT) {
   }
 }
 
-TEST(LibRGW, CLEANUP) {
+TEST(LibRGW, CLEANUP2) {
   if (do_readv) {
     // release resources
     ASSERT_NE(uio->uio_rele, nullptr);
diff --git a/src/test/librgw_file_marker.cc b/src/test/librgw_file_marker.cc
index 9aaa6b3256b52..8c8a7a76566d8 100644
--- a/src/test/librgw_file_marker.cc
+++ b/src/test/librgw_file_marker.cc
@@ -393,7 +393,7 @@ TEST(LibRGW, MARKER1_OBJ_CLEANUP)
   marker_objs.clear();
 }
 
-TEST(LibRGW, CLEANUP) {
+TEST(LibRGW, CLEANUP6) {
   int rc;
 
   if (do_marker1) {
diff --git a/src/test/librgw_file_nfsns.cc b/src/test/librgw_file_nfsns.cc
index 9e023c28af0e7..f13df58e54c9f 100644
--- a/src/test/librgw_file_nfsns.cc
+++ b/src/test/librgw_file_nfsns.cc
@@ -1079,7 +1079,7 @@ TEST(LibRGW, MARKER1_OBJ_CLEANUP)
   marker_objs.clear();
 }
 
-TEST(LibRGW, CLEANUP) {
+TEST(LibRGW, CLEANUP5) {
   int rc;
 
   if (do_marker1) {
-- 
2.39.5