From 5613fe38a99c705cadf2b8f7cdc8aa4cfdf464d6 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 8 Feb 2018 19:09:25 +0800 Subject: [PATCH] test/test_admin_socket_output: allow different asok directory the asok files are not necessary located in ./out, actually, they are put in $TMPDIR/ceph-asok.$random_stuff . Signed-off-by: Kefu Chai --- src/test/admin_socket_output.h | 4 ++-- src/test/test_admin_socket_output.cc | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/admin_socket_output.h b/src/test/admin_socket_output.h index 1eda77430c911..3be7311907fb5 100644 --- a/src/test/admin_socket_output.h +++ b/src/test/admin_socket_output.h @@ -41,8 +41,8 @@ public: void exec(); - void mod_for_vstart() { - socketdir = "./out"; + void mod_for_vstart(const std::string& dir) { + socketdir = dir; prefix = ""; } diff --git a/src/test/test_admin_socket_output.cc b/src/test/test_admin_socket_output.cc index 7e1b35d0aacc2..9ce244e6341f8 100644 --- a/src/test/test_admin_socket_output.cc +++ b/src/test/test_admin_socket_output.cc @@ -58,7 +58,8 @@ int main(int argc, char** argv) { ("mgr", "Test mgr admin socket output") ("mds", "Test mds admin socket output") ("client", "Test client (includes rgw) admin socket output") - ("vstart", "Modify to run in vstart environment") + ("vstart", po::value()->implicit_value("./out"), + "Modify to run in vstart environment") ; auto parsed = po::command_line_parser(argc, argv).options(desc).allow_unregistered().run(); @@ -80,7 +81,7 @@ int main(int argc, char** argv) { std::unique_ptr asockout(new AdminSocketOutput); if (vm.count("vstart")) { - asockout->mod_for_vstart(); + asockout->mod_for_vstart(vm["vstart"].as()); } if(vm.count("all")) { -- 2.39.5