Merge branch 'tizen' into security-manager

Change-Id: I7ac3279e0d1cc56ee8c327af381dca9a303a3026
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

diff --cc src/security-manager-tests/security_manager_tests.cpp
index 14016503cbfbdad9a23eb612d754a721d2a1be04,cdd29f1dbc0aca385658b72cc5844ae6c05c5896..e182365c5057ed55a13dd2099d447e2c1d20f58a
--- 1/src/security-manager-tests/security_manager_tests.cpp
--- 2/src/security-manager-tests/security_manager_tests.cpp
+++ b/src/security-manager-tests/security_manager_tests.cpp
@@@ -1338,15 -1326,11 +1338,15 @@@ RUNNER_CHILD_TEST(security_manager_11_p
      };
  }
  
- RUNNER_MULTIPROCESS_TEST(security_manager_12_privacy_manager_fetch_whole_policy_for_admin_privileged)
+ RUNNER_CHILD_TEST(security_manager_12_privacy_manager_fetch_whole_policy_for_admin_privileged)
  {
 +    std::vector<PolicyEntry> oldPolicyVec;
 +    Api::getPolicy(PolicyEntry(), oldPolicyVec);
 +    std::unordered_set<PolicyEntry> oldPolicySet(oldPolicyVec.begin(), oldPolicyVec.end());
 +
      //TEST DATA
      const std::vector<std::string> usernames = {"sm_test_12_user_name_1", "sm_test_12_user_name_2"};
 -    unsigned int privileges_count = 0;
 +    unsigned int privileges_count = oldPolicyVec.size();
  
      std::map<std::string, std::map<std::string, std::set<std::string>>> users2AppsMap;
      std::map<std::string, std::set<std::string>> apps2PrivsMap;
@@@ -1746,8 -1768,9 +1746,8 @@@ RUNNER_CHILD_TEST(security_manager_14_p
  
  }
  
- RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin)
+ RUNNER_CHILD_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin)
  {
 -    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
      const char *const update_app_id = "security_manager_15_update_app_id";
      const char *const update_privilege = "http://tizen.org/privilege/led";
      const char *const check_start_bucket = "ADMIN";
@@@ -1813,8 -1836,9 +1813,8 @@@
      }
  }
  
- RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin_wildcard)
+ RUNNER_CHILD_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin_wildcard)
  {
 -    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
      const char *const update_other_app_id = "security_manager_15_update_other_app_id";
      const char *const update_privilege = "http://tizen.org/privilege/led";
      const char *const check_start_bucket = "ADMIN";
@@@ -1881,8 -1905,9 +1881,8 @@@
      }
  }
  
- RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_self)
+ RUNNER_CHILD_TEST(security_manager_15_privacy_manager_send_policy_update_for_self)
  {
 -    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
      const char *const update_app_id = "security_manager_15_update_app_id";
      const char *const update_privilege = "http://tizen.org/privilege/led";
      const char *const check_start_bucket = "";