Fix static analyzer issues

- Fix uncaught exception.

Change-Id: I004cf553ecf9f96db1d2ab1642c3905cd8ea56ef
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/unit_tests/extensive_smoke_test.cc b/src/unit_tests/extensive_smoke_test.cc
index 2f54319..ffcec81 100644 (file)
--- a/src/unit_tests/extensive_smoke_test.cc
+++ b/src/unit_tests/extensive_smoke_test.cc
@@ -416,16 +416,21 @@ TEST_F(SmokeTest, MountUpdateMode_Rollback) {
 }  // namespace smoke_test
 
 int main(int argc,  char** argv) {
-  ci::RequestMode request_mode = smoke_test::ParseRequestMode(argc, argv);
-  if (getuid() != 0 || request_mode != ci::RequestMode::GLOBAL) {
-    std::cout << "Skip tests for preload request" << std::endl;
-    ::testing::GTEST_FLAG(filter) = "SmokeTest.*";
+  try {
+    ci::RequestMode request_mode = smoke_test::ParseRequestMode(argc, argv);
+    if (getuid() != 0 || request_mode != ci::RequestMode::GLOBAL) {
+      std::cout << "Skip tests for preload request" << std::endl;
+      ::testing::GTEST_FLAG(filter) = "SmokeTest.*";
+    }
+    testing::InitGoogleTest(&argc, argv);
+    ::env = static_cast<smoke_test::SmokeEnvironment*>(
+        testing::AddGlobalTestEnvironment(
+            new smoke_test::SmokeEnvironment(request_mode)));
+    signal(SIGINT, ::signalHandler);
+    signal(SIGSEGV, ::signalHandler);
+    return RUN_ALL_TESTS();
+  } catch (...) {
+    std::cout << "Exception occurred during testing" << std::endl;
+    return 1;
   }
-  testing::InitGoogleTest(&argc, argv);
-  ::env = static_cast<smoke_test::SmokeEnvironment*>(
-      testing::AddGlobalTestEnvironment(
-          new smoke_test::SmokeEnvironment(request_mode)));
-  signal(SIGINT, ::signalHandler);
-  signal(SIGSEGV, ::signalHandler);
-  return RUN_ALL_TESTS();
 }

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 3699aa4..d252a9b 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -718,16 +718,21 @@ TEST_F(SmokeTest, InstallExtended_Tpk) {
 }  // namespace smoke_test
 
 int main(int argc,  char** argv) {
-  ci::RequestMode request_mode = st::ParseRequestMode(argc, argv);
-  if (getuid() != 0 || request_mode != ci::RequestMode::GLOBAL) {
-    std::cout << "Skip tests for preload request" << std::endl;
-    ::testing::GTEST_FLAG(filter) = "SmokeTest.*";
+  try {
+    ci::RequestMode request_mode = st::ParseRequestMode(argc, argv);
+    if (getuid() != 0 || request_mode != ci::RequestMode::GLOBAL) {
+      std::cout << "Skip tests for preload request" << std::endl;
+      ::testing::GTEST_FLAG(filter) = "SmokeTest.*";
+    }
+    testing::InitGoogleTest(&argc, argv);
+    ::env = static_cast<smoke_test::SmokeEnvironment*>(
+        testing::AddGlobalTestEnvironment(
+            new smoke_test::SmokeEnvironment(request_mode)));
+    signal(SIGINT, ::signalHandler);
+    signal(SIGSEGV, ::signalHandler);
+    return RUN_ALL_TESTS();
+  } catch (...) {
+    std::cout << "Exception occurred during testing" << std::endl;
+    return 1;
   }
-  testing::InitGoogleTest(&argc, argv);
-  ::env = static_cast<smoke_test::SmokeEnvironment*>(
-      testing::AddGlobalTestEnvironment(
-          new smoke_test::SmokeEnvironment(request_mode)));
-  signal(SIGINT, ::signalHandler);
-  signal(SIGSEGV, ::signalHandler);
-  return RUN_ALL_TESTS();
 }