Merge branch 'tkt-flow-94_should-log-perf' of github.com:Flow-IPC/ipc into tkt-flow-94_should-log-perf

Author: ygoldfeld

test/suite/unit_test/CMakeLists.txt

@@ -65,7 +65,6 @@ set(isal_root ${FLOW_LIKE_META_ROOT_ipc_shm_arena_lend}/src)
 
 set(SRCS
     ${FLOW_LIKE_META_ROOT_flow}/src/flow/test/test_common_util.cpp
-    ${FLOW_LIKE_META_ROOT_flow}/src/flow/test/test_config.cpp
     ${FLOW_LIKE_META_ROOT_flow}/src/flow/test/test_file_util.cpp
     ${FLOW_LIKE_META_ROOT_ipc_core}/src/ipc/test/test_common_util.cpp
     ${isal_root}/ipc/session/standalone/shm/arena_lend/jemalloc/test/shm_session_test.cpp
@@ -106,7 +105,6 @@ handle_binary(libipc_unit_test.exec)
 
 set(SRCS
     ${FLOW_LIKE_META_ROOT_flow}/src/flow/test/test_common_util.cpp
-    ${FLOW_LIKE_META_ROOT_flow}/src/flow/test/test_config.cpp
     ${isal_root}/ipc/shm/arena_lend/test/test_borrower.cpp
     test_borrower_main.cpp)
 unset(CAPNP_SCHEMAS)

test/suite/unit_test/test_borrower_main.cpp

@@ -75,9 +75,10 @@ static int parse_and_execute(int argc, char** argv)
   Test_config::get_singleton(); // Touching it just below.
 
   po::options_description cmd_line_opts("unit test options");
+  const string HELP_PARAM = "help";
   cmd_line_opts.add_options()
-    ((Test_config::S_HELP_PARAM + ",h").c_str(), "help")
-    ((Test_config::S_LOG_SEVERITY_PARAM + ",l").c_str(), po::value<flow::log::Sev>(&Test_config::get_singleton().m_sev),
+    ((HELP_PARAM + ",h").c_str(), "help")
+    ("min-log-severity,l", po::value<flow::log::Sev>(&Test_config::get_singleton().m_sev),
       "minimum log severity")
     ((Test_borrower::S_SHM_POOL_COLLECTION_ID_PARAM + ",c").c_str(),
      po::value<Collection_id>(&shm_pool_collection_id),
@@ -95,7 +96,7 @@ static int parse_and_execute(int argc, char** argv)
     po::store(cmd_line_parsed_opts, vm);
     po::notify(vm);
 
-    if (vm.count(Test_config::S_HELP_PARAM) > 0)
+    if (vm.count(HELP_PARAM) > 0)
     {
       cout << cmd_line_opts << "\n";
       return static_cast<int>(Status_code::S_HELP);

test/suite/unit_test/test_main.cpp

@@ -76,10 +76,13 @@ int configure_logging(int argc, char* argv[])
   Test_config::get_singleton(); // Touching it just below.
 
   po::options_description cmd_line_opts("unit test options");
+  const string HELP_PARAM = "help";
   cmd_line_opts.add_options()
-    ((Test_config::S_HELP_PARAM + ",h").c_str(), "help")
-    ((Test_config::S_LOG_SEVERITY_PARAM + ",l").c_str(), po::value<flow::log::Sev>(&Test_config::get_singleton().m_sev),
-     "minimum log severity");
+    ((HELP_PARAM + ",h").c_str(), "help")
+    ("min-log-severity,l", po::value<flow::log::Sev>(&Test_config::get_singleton().m_sev),
+     "minimum log severity")
+    ("do-not-fail-benchmarks", po::bool_switch(&Test_config::get_singleton().m_do_not_fail_benchmarks),
+     "sensitive (not necessarily all) benchmarks may be performed but won't cause failure.");
 
   try
   {
@@ -88,7 +91,7 @@ int configure_logging(int argc, char* argv[])
     po::store(cmd_line_parsed_opts, vm);
     po::notify(vm);
 
-    if (vm.count(Test_config::S_HELP_PARAM) > 0)
+    if (vm.count(HELP_PARAM) > 0)
     {
       cout << cmd_line_opts << "\n";
       return 1;