Fix uncaught exception in haltests

Change-Id: I7615631a4da292493757b00a8c4c9340429f60ec
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/haltests/wifi-haltests.cpp b/haltests/wifi-haltests.cpp
index 508fb763575ae14da5c472afef300381323e4ab2..a40c9a0ec9c2e43f434b06fef7b75641c86e6e14 100755 (executable)
--- a/haltests/wifi-haltests.cpp
+++ b/haltests/wifi-haltests.cpp
@@ -425,12 +425,27 @@ TEST(WifiHaltest, SoftapDeinit_p)
 
 int main(int argc, char **argv)
 {
+       int ret = -1;
+
        if (argc > 1 && argv[argc - 1][0] != '-') {
                g_strlcpy(ap_name, argv[argc - 1], MAX_AP_LENGTH);
                argc--;
        }
 
        __set_p2p_ifname();
-       InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
+
+       try {
+               InitGoogleTest(&argc, argv);
+       } catch(...) {
+               std::cout << "Exception occurred." << std::endl;
+       }
+
+       try {
+               ret = RUN_ALL_TESTS();
+       } catch (const ::testing::internal::GoogleTestFailureException& e) {
+               ret = -1;
+               std::cout << "GoogleTestFailureException was thrown:" << e.what() << std::endl;
+       }
+
+       return ret;
 }