[SmokeTest] Fixes for ParseRequestMode() function

- Allow to parse unknown options.
- Return global request mode for unknown options.

Change-Id: I2f2c71820a6f5e8552842f4c3ee0378617176aa8
Signed-off-by: Damian Pietruchowski <d.pietruchow@samsung.com>

diff --git a/src/unit_tests/smoke_utils.cc b/src/unit_tests/smoke_utils.cc
index fff20f4..c88f3fa 100644 (file)
--- a/src/unit_tests/smoke_utils.cc
+++ b/src/unit_tests/smoke_utils.cc
@@ -84,7 +84,8 @@ ci::RequestMode ParseRequestMode(int argc,  char** argv) {
       ("user-request,u", "set request mode to user");
 
   bo::variables_map vm;
-  bo::store(bo::parse_command_line(argc, argv, desc), vm);
+  bo::store(bo::command_line_parser(argc, argv).
+      options(desc).allow_unregistered().run(), vm);
   bo::notify(vm);
 
   if (vm.count("global-request")) {
@@ -106,9 +107,9 @@ ci::RequestMode ParseRequestMode(int argc,  char** argv) {
     }
     std::cout << "Cannot set request mode to "
               << vm["request-mode"].as<std::string>() << std::endl;
-    std::cout << "Request mode was set to global." << std::endl;
-    return ci::RequestMode::GLOBAL;
   }
+  std::cout << "Request mode was set to global." << std::endl;
+  return ci::RequestMode::GLOBAL;
 }
 
 bool TouchFile(const bf::path& path) {