test,tools: capture boost::program_options in a try

When something fails boost::program_options throws an exception that
needs to be caught.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/src/test/bench/small_io_bench_dumb.cc b/src/test/bench/small_io_bench_dumb.cc
index 73841c3c6e40d4a75adc08c32fdce24384ef5f47..fbcca87c7f52da618411ad72f0e68a147d89bed7 100644 (file)
--- a/src/test/bench/small_io_bench_dumb.cc
+++ b/src/test/bench/small_io_bench_dumb.cc
@@ -71,7 +71,9 @@ int main(int argc, char **argv)
      "don't dump per op stats")
     ;
 
+  vector<string> ceph_option_strings;
   po::variables_map vm;
+  try {
   po::parsed_options parsed =
     po::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
   po::store(
@@ -79,9 +81,10 @@ int main(int argc, char **argv)
     vm);
   po::notify(vm);
 
+    ceph_option_strings = po::collect_unrecognized(parsed.options,
+                                                  po::include_positional);
+  }
   vector<const char *> ceph_options, def_args;
-  vector<string> ceph_option_strings = po::collect_unrecognized(
-    parsed.options, po::include_positional);
   ceph_options.reserve(ceph_option_strings.size());
   for (vector<string>::iterator i = ceph_option_strings.begin();
        i != ceph_option_strings.end();

diff --git a/src/test/bench/small_io_bench_fs.cc b/src/test/bench/small_io_bench_fs.cc
index 7f03f5ad2a3c6c904ba559255f10ae87bce15849..74f6565174d88b5ca248cf4d874d430b917314aa 100644 (file)
--- a/src/test/bench/small_io_bench_fs.cc
+++ b/src/test/bench/small_io_bench_fs.cc
@@ -82,7 +82,9 @@ int main(int argc, char **argv)
      "num write threads")
     ;
 
+  vector<string> ceph_option_strings;
   po::variables_map vm;
+  try {
   po::parsed_options parsed =
     po::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
   po::store(
@@ -90,9 +92,10 @@ int main(int argc, char **argv)
     vm);
   po::notify(vm);
 
+  ceph_option_strings = po::collect_unrecognized(parsed.options,
+                                                po::include_positional);
+  }
   vector<const char *> ceph_options, def_args;
-  vector<string> ceph_option_strings = po::collect_unrecognized(
-    parsed.options, po::include_positional);
   ceph_options.reserve(ceph_option_strings.size());
   for (vector<string>::iterator i = ceph_option_strings.begin();
        i != ceph_option_strings.end();

diff --git a/src/test/bench/tp_bench.cc b/src/test/bench/tp_bench.cc
index 31a4db37e09c89c1e09f238cac21ec59c37ec7b0..778dcac3ff565e54eeea2b8c2cd02319ff014b97 100644 (file)
--- a/src/test/bench/tp_bench.cc
+++ b/src/test/bench/tp_bench.cc
@@ -118,7 +118,9 @@ int main(int argc, char **argv)
      "layer desc")
     ;
 
+  vector<string> ceph_option_strings;
   po::variables_map vm;
+  try {
   po::parsed_options parsed =
     po::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
   po::store(
@@ -126,9 +128,10 @@ int main(int argc, char **argv)
     vm);
   po::notify(vm);
 
+  ceph_option_strings = po::collect_unrecognized(parsed.options,
+                                                po::include_positional);
+  }
   vector<const char *> ceph_options, def_args;
-  vector<string> ceph_option_strings = po::collect_unrecognized(
-    parsed.options, po::include_positional);
   ceph_options.reserve(ceph_option_strings.size());
   for (vector<string>::iterator i = ceph_option_strings.begin();
        i != ceph_option_strings.end();

diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc
index ed48205e8eff766e87ad9db99127ca227c5cae70..4a5282d4f7e74a52ea5ee4b6efefac2638ccd630 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code.cc
+++ b/src/test/erasure-code/ceph_erasure_code.cc
@@ -146,10 +146,12 @@ int ErasureCodeCommand::run() {
 
 int main(int argc, char** argv) {
   ErasureCodeCommand eccommand;
+  try {
   int err = eccommand.setup(argc, argv);
   if (err)
     return err;
   return eccommand.run();
+  }
 }
 
 /*

diff --git a/src/test/erasure-code/ceph_erasure_code_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
index c6a4228bdc1e4a40f1fbf4fea120abc05bdf1809..c104651b372b579f75ea40dd39f08ebc538e32f0 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code_benchmark.cc
+++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
@@ -218,10 +218,12 @@ int ErasureCodeBench::decode()
 
 int main(int argc, char** argv) {
   ErasureCodeBench ecbench;
+  try {
   int err = ecbench.setup(argc, argv);
   if (err)
     return err;
   return ecbench.run();
+  }
 }
 
 /*

diff --git a/src/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc
index d26add613c107db0ad17b73968aab1a95f8e3f4f..c5cb0e1152e5625c34f1332a902ba73340429ef3 100644 (file)
--- a/src/tools/ceph_monstore_tool.cc
+++ b/src/tools/ceph_monstore_tool.cc
@@ -134,12 +134,12 @@ int main(int argc, char **argv) {
   p.add("version", 1);
 
   po::variables_map vm;
+  try {
   po::parsed_options parsed =
     po::command_line_parser(argc, argv).options(desc).positional(p).run();
   po::store(
     parsed,
     vm);
-  try {
     po::notify(vm);
   } catch (...) {
     cout << desc << std::endl;

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 288e9cb14a179b97a7022cbd73f5c159ee9a64be..827874f704624b6b16f5bce8565da20a34a1f8f9 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -1838,10 +1838,10 @@ int main(int argc, char **argv)
   pd.add("object", 1).add("objcmd", 1).add("arg1", 1).add("arg2", 1);
 
   po::variables_map vm;
+  try {
   po::parsed_options parsed =
    po::command_line_parser(argc, argv).options(all).allow_unregistered().positional(pd).run();
   po::store( parsed, vm);
-  try {
     po::notify(vm);
   }
   catch(...) {

diff --git a/src/tools/ceph_osdomap_tool.cc b/src/tools/ceph_osdomap_tool.cc
index eba41157c9fc2bae0a0f8771cba365e8d0299ba2..3e4cae28396b86ce0a6a3e2b9e439feedbfe6ca1 100644 (file)
--- a/src/tools/ceph_osdomap_tool.cc
+++ b/src/tools/ceph_osdomap_tool.cc
@@ -42,12 +42,12 @@ int main(int argc, char **argv) {
   p.add("command", 1);
 
   po::variables_map vm;
+  try {
   po::parsed_options parsed =
     po::command_line_parser(argc, argv).options(desc).positional(p).run();
   po::store(
     parsed,
     vm);
-  try {
     po::notify(vm);
   } catch (...) {
     cout << desc << std::endl;