Merge branch 'tizen' into nether

Change-Id: Ibbe2fd16bc7f4576d27bae7e9a1893d8ec04dc91

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/security-tests.manifest
index 3dfa31787f880eadabf394808f5c3b5241464664,a6ecbcd6dddb6a616041e7db0553c133fe90f9c7..790c8519b1af0fa4ef5de272ab0b862bde6394d4
--- 1/packaging/security-tests.manifest
--- 2/packaging/security-tests.manifest
+++ b/packaging/security-tests.manifest
@@@ -10,8 -6,7 +6,8 @@@
          <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" />
 +        <filesystem path="/usr/bin/nether-tests" exec_label="System::Privileged" />
      </assign>
      <request>
          <domain name="_" />

diff --cc packaging/security-tests.spec
index ed63dd21279e3db9cef8d7de50af236846d9f6b0,f96f79bac0e0675a63db9ca06105c9d888eeeac0..4145d084cf39ab2ae847a9d8e33482b42d554b6a
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -104,9 -99,10 +105,11 @@@ echo "security-tests postinst done ...
  %attr(755, security_test_user,users) %{TZ_SYS_HOME}/security_test_user/apps_rw/*
  /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
 +/usr/bin/nether-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*

diff --cc src/security-tests.sh
Simple merge