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>

diff --git a/src/test/librgw_file.cc b/src/test/librgw_file.cc
index fea8a061191681bd20ffb49d67f6dca465c6dcf7..32e193eb5c7b69f2f764bfe95d6717e4485b53a3 100644 (file)
--- 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 ed51610cecf8fa0e7bf8330fc252bc5d77136e6e..b72cca75d4653a77f28b855cb1313c77d71ef670 100644 (file)
--- 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 b779f044d20031c3c6f031ba00521643d1597b1c..c836330a71a64eacaa4ede53be93f92740b1dcd5 100644 (file)
--- 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 1ad41cfd30f2cadd3f5f1993b3afa2c95a729af8..047ae9db5a970714e29663a5fb983a7f683e94dc 100644 (file)
--- 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 9aaa6b3256b52ece726f4636a3e4e8f7f419954a..8c8a7a76566d8ebfc37adb74883d32a30c544b52 100644 (file)
--- 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 9e023c28af0e764f91175e3a89d91e0ab3dd0f08..f13df58e54c9f1d9bed207e6b771e3b6263ebe78 100644 (file)
--- 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) {