Merge branch 'tizen' into ckm

Change-Id: Ia41b08bee4b8f23f8e6dbf50f6fae1baf38eeb65

diff --cc .gitignore
index d67fca0,b529165..284ee56
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,5 +1,16 @@@
 +# cscope/ctag data #
 +####################
 +cscope.files
 +cscope.out
 +tags
 +
 +# Temporary files #
 +###################
 +*.swp
 +*~
+ build
+ GPATH
+ GRTAGS
+ GTAGS
+ .dir-locals.el
++

diff --cc CMakeLists.txt
index 526f196,a89c09c..01ce9fb
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -89,11 -94,13 +94,15 @@@ IF(SMACK_ENABLE
      ADD_DEFINITIONS("-DWRT_SMACK_ENABLED")
  ENDIF(SMACK_ENABLE)
  
+ IF(NOT DEFINED SHARE_INSTALL_PREFIX)
+       SET(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share")
+ ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
+ 
  ############################# Targets names ###################################
  
 +SET(TARGET_CKM_TEST_COMMON "ckm-test-common")
  SET(TARGET_CKM_TESTS "ckm-tests")
 +SET(TARGET_CKM_PRIVILEGED_TESTS "ckm-privileged-tests")
  SET(TARGET_CKMI_TESTS "ckm-integration-tests")
  SET(COMMON_TARGET_TEST "tests-common")
  

diff --cc packaging/security-tests.manifest
index ff7bf47,a65ddaa..245b716
--- 1/packaging/security-tests.manifest
--- 2/packaging/security-tests.manifest
+++ b/packaging/security-tests.manifest
@@@ -7,10 -7,10 +7,10 @@@
          <filesystem path="/usr/bin/test-performance-check.sh" exec_label="_" />
  
          <filesystem path="/usr/bin/libsmack-test" exec_label="_" />
-         <filesystem path="/usr/bin/security-manager-tests" exec_label="_" />
+         <filesystem path="/usr/bin/security-manager-tests" exec_label="System::Privileged" />
          <filesystem path="/usr/bin/cynara-tests" exec_label="_" />
          <filesystem path="/usr/bin/ckm-tests" exec_label="User" />
 -        <filesystem path="/usr/bin/ckm-tests" exec_label="System" />
 +        <filesystem path="/usr/bin/ckm-privileged-tests" exec_label="System::Privileged" />
      </assign>
      <request>
          <domain name="_" />

diff --cc packaging/security-tests.spec
index 8c525c6,f981779..5709263
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -83,12 -92,11 +92,13 @@@ echo "security-tests postinst done ...
  /usr/bin/security-manager-tests
  /etc/smack/test_smack_rules
  /etc/smack/test_smack_rules_lnk
- /usr/apps/*
+ %{TZ_SYS_RW_APP}*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
 +/usr/bin/ckm-privileged-tests
 +/usr/bin/ckm-tests-on-onlycap.sh
  /usr/bin/ckm-integration-tests
+ /usr/bin/yaca-test
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*

diff --cc src/ckm/ckm-common.h
index f1cc8c1,c3908ca..d5f6081
--- 1/src/ckm/ckm-common.h
--- 2/src/ckm/ckm-common.h
+++ b/src/ckm/ckm-common.h
@@@ -87,7 -89,17 +87,8 @@@ std::string getLabel()
  std::string getOwnerIdFromSelf();
  
  std::string aliasWithLabel(const char *label, const char *alias);
 -// changes process label upon construction and restores it upon destruction
 -class ScopedLabel
 -{
 -public:
 -    ScopedLabel(const char* label);
 -    ~ScopedLabel();
 -
 -private:
 -    std::string m_original_label;
 -};
+ 
 +std::string aliasWithLabelFromSelf(const char *alias);
  
  void save_data(const char* alias, const char *data, int expected_err = CKMC_ERROR_NONE);
  void save_data(const char* alias, const char *data, size_t len, int expected_err);

diff --cc src/common/tests_common.h
Simple merge