update ceph source to reef 18.1.2

[ceph.git] / ceph / src / test / test_rgw_admin_log.cc

diff --git a/ceph/src/test/test_rgw_admin_log.cc b/ceph/src/test/test_rgw_admin_log.cc
index 4204ee5c4d49f68b6bf57ad2436915871a70786b..fe072ead18a1b68a7d98e3f2a766cc7a34020391 100644 (file)
--- a/ceph/src/test/test_rgw_admin_log.cc
+++ b/ceph/src/test/test_rgw_admin_log.cc
@@ -32,23 +32,15 @@ extern "C"{
 #include "common/ceph_argparse.h"
 #include "common/Finisher.h"
 #include "global/global_init.h"
-#include "rgw/rgw_common.h"
-#include "rgw/rgw_bucket.h"
-#include "rgw/rgw_rados.h"
+#include "rgw_common.h"
+#include "rgw_datalog.h"
+#include "rgw_mdlog.h"
+#include "rgw_bucket.h"
+#include "rgw_rados.h"
 #include "include/utime.h"
 #include "include/object.h"
-#define GTEST
-#ifdef GTEST
 #include <gtest/gtest.h>
-#else
-#define TEST(x, y) void y()
-#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \
-                                else cout << "(" << #v << "==" << #s << ") PASSED\n";
-#define EXPECT_EQ(v, s) ASSERT_EQ(v, s)
-#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \
-                          else cout << "(" << #c << ") PASSED\n";
-#define EXPECT_TRUE(c) ASSERT_TRUE(c) 
-#endif
+
 using namespace std;
 
 #define CURL_VERBOSE 0
@@ -1568,8 +1560,7 @@ TEST(TestRGWAdmin, bilog_trim) {
 }
 
 int main(int argc, char *argv[]){
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,