projects / platform / core / test / security-tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f398c8 a1abff5)
Merge branch 'ckm' into tizen 02/178002/1
authorDariusz Michaluk <d.michaluk@samsung.com>
Mon, 7 May 2018 08:37:26 +0000 (10:37 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Mon, 7 May 2018 08:40:36 +0000 (10:40 +0200)
Change-Id: I96b738bb76659cbd11a6b110c6173378d476fffd

1  2 
packaging/security-tests.spec patch | diff1 | diff2 | blob | history
src/common/tests_common.h patch | diff1 | diff2 | blob | history

diff --cc packaging/security-tests.spec
index 709a3e6,66680e6..f96f79b
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -95,9 -95,11 +96,11 @@@ echo "security-tests postinst done ...
  /etc/smack/test_smack_rules
  /etc/smack/test_smack_rules_lnk
  %{TZ_SYS_RW_APP}*
 -%{TZ_SYS_HOME}/security_test_user/apps_rw/*
 +%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
  %{ckm_test_dir}/*
diff --cc src/common/tests_common.h
Simple merge
Domain: Security / Uncategorized;