From: Dariusz Michaluk <d.michaluk@samsung.com>
Date: Mon, 7 May 2018 09:36:08 +0000 (+0200)
Subject: Merge branch 'tizen' into cynara
X-Git-Tag: security-manager_5.5_testing~7^4~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=476ebec06ecae35f131b5b22a5dd00da058fe1c9;hp=-c;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Merge branch 'tizen' into cynara

Change-Id: I64b5d9579b92d7f09dd62979b7ed6e0f9c0d5f1f
---

476ebec06ecae35f131b5b22a5dd00da058fe1c9
diff --combined packaging/security-tests.manifest
index 652a0cd,a6ecbcd..ea004f1
--- a/packaging/security-tests.manifest
+++ b/packaging/security-tests.manifest
@@@ -1,14 -1,12 +1,15 @@@
  <manifest>
      <assign>
-         <filesystem path="/usr/bin/security-tests.sh" exec_label="System::Privileged" />
-         <filesystem path="/usr/bin/security-tests-all.sh" exec_label="System::Privileged" />
-         <filesystem path="/usr/bin/test-performance-check.sh" exec_label="System::Privileged" />
+         <filesystem path="/usr/bin/test-performance-check.sh" exec_label="_" />
  
-         <filesystem path="/usr/bin/ckm-tests" exec_label="System" />
-         <filesystem path="/usr/bin/cynara-test" exec_label="System::Privileged" />
-         <filesystem path="/usr/bin/libsmack-test" exec_label="System::Privileged" />
+         <filesystem path="/usr/bin/libsmack-test" 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-privileged-tests" exec_label="System::Privileged" />
++        <filesystem path="/usr/bin/nether-tests" exec_label="System::Privileged" />
++        <filesystem path="/usr/bin/libteec-tests" exec_label="System::Privileged" />
 +        <filesystem path="/usr/bin/yaca-test" exec_label="System::Privileged" />
      </assign>
      <request>
          <domain name="_" />