Merge "net-config:Generalize the setting of rps_cpus" into tizen

diff --git a/gtest/unittest.cpp b/gtest/unittest.cpp
index ad4bf14..7db3ff9 100755 (executable)
--- a/gtest/unittest.cpp
+++ b/gtest/unittest.cpp
@@ -1048,7 +1048,7 @@ TEST(WifiTest, ReqSimAuth_p)
 {
        error_e ret = ERROR_NONE;
        Wifi mgr;
-       const unsigned char *rand_data =  (unsigned char *)"01234567890123456";
+       const unsigned char *rand_data =  (unsigned char *)"0123456789012345";
        unsigned int length = 16;
        bool result;
 
@@ -1061,7 +1061,8 @@ TEST(WifiTest, ReqSimAuth_n)
 {
        error_e ret = ERROR_NONE;
        Wifi mgr;
-       const unsigned char *rand_data =  (unsigned char *)"\0";
+       unsigned char rand[5] = {0, };
+       const unsigned char *rand_data =  (unsigned char *)rand;
        unsigned int length = 5;
        bool result;
 
@@ -1076,10 +1077,10 @@ TEST(WifiTest, ReqAkaAuth_p)
        Wifi mgr;
        unsigned char rand[] = {65, 61, 62, 63, 64, 65, 66, 67,
                68, 69, 70, 71, 72, 73, 74, 75};
-       unsigned char autn[] = {65, 61, 62, 63, 64, 65, 66, 67,
+       unsigned char auth[] = {65, 61, 62, 63, 64, 65, 66, 67,
                68, 69, 70, 71, 72, 73, 74, 75};
        const unsigned char *rand_data =  (unsigned char *)rand;
-       const unsigned char *auth_data =  (unsigned char *)autn;
+       const unsigned char *auth_data =  (unsigned char *)auth;
        int length = 16;
        bool result;
 
@@ -1092,8 +1093,10 @@ TEST(WifiTest, ReqAkaAuth_n)
 {
        error_e ret = ERROR_NONE;
        Wifi mgr;
-       const unsigned char *rand_data =  (unsigned char *)"\0";
-       const unsigned char *auth_data =  (unsigned char *)"\0";
+       unsigned char rand[5] = {0, };
+       unsigned char auth[5] = {0, };
+       const unsigned char *rand_data =  (unsigned char *)rand;
+       const unsigned char *auth_data =  (unsigned char *)auth;
        int length = 5;
        bool result;
 
@@ -1372,6 +1375,20 @@ TEST(WifiTest, Start_n)
 
 int main(int argc, char **argv)
 {
-       InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
+       int ret = -1;
+
+       try {
+               testing::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;
 }