]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librgw: forward cmdline args to librgw_create
authorMatt Benjamin <mbenjamin@redhat.com>
Tue, 6 Oct 2015 20:59:58 +0000 (16:59 -0400)
committerMatt Benjamin <mbenjamin@redhat.com>
Fri, 12 Feb 2016 17:04:48 +0000 (12:04 -0500)
Verified w/-d.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/test/librgw_file.cc

index 9fedc054bc3e7542b113faef5cdb09e1536e7966..33c36f3aca6105799c4e2b498d04c3f2df62a0b0 100644 (file)
@@ -33,10 +33,15 @@ namespace {
   typedef std::tuple<string,uint64_t, struct rgw_file_handle*> fid_type; //in c++2014 can alias...
   std::vector<fid_type> fids1;
   std::vector<fid_type> fids2;
+
+  struct {
+    int argc;
+    char **argv;
+  } saved_args;
 }
 
 TEST(LibRGW, INIT) {
-  int ret = librgw_create(&rgw, nullptr, 0, nullptr);
+  int ret = librgw_create(&rgw, nullptr, saved_args.argc, saved_args.argv);
   ASSERT_EQ(ret, 0);
   ASSERT_NE(rgw, nullptr);
 }
@@ -174,6 +179,9 @@ int main(int argc, char *argv[])
     }
   }
 
+  saved_args.argc = argc;
+  saved_args.argv = argv;
+
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }