Add missing try/catch blocks.

Document that create_*_op is public but not for public consumption.

1 files changed, 22 insertions, 7 deletions

diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index b771d9614..d80049d53 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -312,14 +312,29 @@ int main(int argc, char* argv[])
                                              BOTAN_VERSION_MINOR,
                                              BOTAN_VERSION_PATCH);
 
-   std::unique_ptr<Botan_CLI::Command> cmd(Botan_CLI::Command::get_cmd("test"));
+   try
+      {
+      std::unique_ptr<Botan_CLI::Command> cmd(Botan_CLI::Command::get_cmd("test"));
 
-   if(!cmd)
+      if(!cmd)
+         {
+         std::cout << "Unable to retrieve testing helper (program bug)\n"; // WTF
+         return 1;
+         }
+
+      std::vector<std::string> args(argv + 1, argv + argc);
+      return cmd->run(args);
+      }
+   catch(Botan::Exception& e)
       {
-      std::cout << "Unable to retrieve testing helper (program bug)\n"; // WTF
-      return 1;
+      std::cout << "Exiting with library exception " << e.what() << std::endl;
+      }
+   catch(std::exception& e)
+      {
+      std::cout << "Exiting with std exception " << e.what() << std::endl;
+      }
+   catch(...)
+      {
+      std::cout << "Exiting with unknown exception\n";
       }
-
-   std::vector<std::string> args(argv + 1, argv + argc);
-   return cmd->run(args);
    }