From: Piotr Sawicki <p.sawicki2@partner.samsung.com>
Date: Wed, 17 May 2017 08:09:38 +0000 (+0200)
Subject: Merge branch 'tizen' into ckm
X-Git-Tag: security-manager_5.5_testing~9^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b0034887a0f5c83dfc80e84c4657e38a60481fc;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Merge branch 'tizen' into ckm

Change-Id: Ia41b08bee4b8f23f8e6dbf50f6fae1baf38eeb65
---

0b0034887a0f5c83dfc80e84c4657e38a60481fc
diff --cc .gitignore
index d67fca00,b529165e..284ee56e
--- a/.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 526f1962,a89c09ce..01ce9fbd
--- a/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 ff7bf478,a65ddaa2..245b7164
--- a/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 8c525c62,f9817793..5709263f
--- a/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 f1cc8c1b,c3908cac..d5f6081e
--- a/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);