Merge of cppccheck fixes.

[m6w6/libmemcached] / libtest / main.cc

diff --git a/libtest/main.cc b/libtest/main.cc
index 5fa538899b820a92b88ecc0fc374a92a4896ae4c..453d29668afdfb45d7f2cdd5f07182dcb6535d28 100644 (file)
--- a/libtest/main.cc
+++ b/libtest/main.cc
@@ -187,11 +187,21 @@ int main(int argc, char *argv[])
     }
   }
 
+  if ((bool(getenv("YATL_RUN_MASSIVE_TESTS"))) or opt_massive)
+  {
+    opt_massive= true;
+  }
+
   if (opt_quiet)
   {
     close(STDOUT_FILENO);
   }
 
+  if (opt_massive)
+  {
+    is_massive(opt_massive);
+  }
+
   char buffer[1024];
   if (getenv("LIBTEST_TMP"))
   {
@@ -316,6 +326,11 @@ int main(int argc, char *argv[])
     std::cerr << "std::exception:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
+  catch (char const*)
+  {
+    std::cerr << "Exception:" << std::endl;
+    exit_code= EXIT_FAILURE;
+  }
   catch (...)
   {
     std::cerr << "Unknown exception halted execution." << std::endl;