Merge branch 'tizen' into security-manager

Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>
Conflicts:
	src/common/tests_common.cpp
	src/common/tests_common.h

Change-Id: Ic2301d3414aad2be4488eb04c59e217e184037ca

diff --cc packaging/security-tests.spec
Simple merge

diff --cc src/common/tests_common.cpp
index 52ef252,e34f401..d08893c
--- 1/src/common/tests_common.cpp
--- 2/src/common/tests_common.cpp
+++ b/src/common/tests_common.cpp
@@@ -232,11 -231,10 +232,17 @@@ void removeDir(const std::string &path
      RUNNER_ASSERT_ERRNO_MSG(0 == rmdir(path.c_str()), "rmdir for <" << path << "> failed");
  }
  
 -
 +void waitPid(pid_t pid)
 +{
 +    int status;
 +    pid_t ret = waitpid(pid, &status, 0);
 +    RUNNER_ASSERT_MSG((ret != -1) && WIFEXITED(status) && WEXITSTATUS(status) == 0,
 +        "Child process exited abnormally" <<
 +        ": ret=" << ret << ", errno=" << errno << ", status=" << status);
 +}
+ // changes process label
+ void change_label(const char* label)
+ {
+     int ret = smack_set_label_for_self(label);
+     RUNNER_ASSERT_MSG(0 == ret, "Error in smack_set_label_for_self("<<label<<"). Error: " << ret);
+ }

diff --cc src/common/tests_common.h
index faf0890,851e1db..251e111
--- 1/src/common/tests_common.h
--- 2/src/common/tests_common.h
+++ b/src/common/tests_common.h
@@@ -56,8 -55,7 +56,8 @@@ void mktreeSafe(const std::string &path
  void creatSafe(const std::string &path, mode_t mode);
  void symlinkSafe(const std::string &targetPath, const std::string &linkPath);
  void removeDir(const std::string &path);
- 
 +void waitPid(pid_t pid);
+ void change_label(const char* label);
  
  #define RUNNER_TEST_SMACK(Proc, ...)                                                        \
      void Proc(std::tuple<__VA_ARGS__> &optionalArgsTuple);                                  \