X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fsecurity-tests.spec;h=4be1f8d3a90c5b7a3b2b510472c4e80050d79e8f;hb=55859d0ed339ac30ae14780b1d1940bcea986834;hp=4136fdc6bb532e060296d0facc7b89348d9beca7;hpb=b4ab3e3119f48107a43b01b61eb2875492439b88;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index 4136fdc..4be1f8d 100644
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -11,25 +11,28 @@ BuildRequires: cmake
 BuildRequires: libattr-devel
 BuildRequires: pkgconfig(libcap)
 BuildRequires: pkgconfig(libsmack)
-BuildRequires: pkgconfig(libprivilege-control)
 BuildRequires: pkgconfig(security-manager)
 BuildRequires: pkgconfig(key-manager)
+BuildRequires: pkgconfig(yaca)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(libpcrecpp)
 BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(libiri)
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(libwebappenc)
 BuildRequires: cynara-devel
+BuildRequires: libcynara-creds-dbus-devel
+BuildRequires: libcynara-creds-gdbus-devel
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: boost-devel
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(libgum) >= 1.0.5
 Requires: perf
 Requires: gdb
-Requires: key-manager-listener
+
+%global ckm_test_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm-test/}%{!?TZ_SYS_SHARE:/usr/share/ckm-test/}
+%global ckm_rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}
 
 %description
 Security tests repository - for tests that can't be kept together with code.
@@ -43,6 +46,7 @@ export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib"
 
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DDPL_LOG="ON"                    \
+        -DDPL_WITH_DLOG="ON"              \
         -DVERSION=%{version}              \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:DEBUG} \
 %if "%{sec_product_feature_security_mdfpp_enable}" == "1"
@@ -50,7 +54,10 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %endif
         -DCMAKE_VERBOSE_MAKEFILE=ON       \
         -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db \
-        -DAPP_USER="security_test_user"
+        -DAPP_USER="security_test_user" \
+        -DCKM_TEST_DIR=%{ckm_test_dir} \
+        -DCKM_RW_DATA_DIR=%{ckm_rw_data_dir} \
+        -DGLOBAL_APP_DIR=%{TZ_SYS_RW_APP}
 make %{?jobs:-j%jobs}
 
 %install
@@ -58,20 +65,12 @@ make %{?jobs:-j%jobs}
 ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
 
 %post
-find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755 {} +
-
-# Load permissions templates
-api_feature_loader --verbose
-
-# Set vconf key for cc-mode testing if vconf key isn't there.
-%if "%{sec_product_feature_security_mdfpp_enable}" != "1"
-    echo "Install vconf key (file/security_mdpp/security_mdpp_state) for testing key-manager"
-    vconftool set -t string file/security_mdpp/security_mdpp_state "Unset"
-%endif
-
 id -u  security_test_user 1>/dev/null 2>&1 || \
     useradd -r -g users -s /sbin/nologin -c "for tests only" security_test_user
 
+# Reload dbus daemon to apply newly installed configuration
+systemctl reload dbus
+
 echo "security-tests postinst done ..."
 
 %files
@@ -84,8 +83,6 @@ echo "security-tests postinst done ..."
 /etc/dbus-1/system.d/security-tests.conf
 
 /usr/bin/libsmack-test
-/usr/bin/smack-dbus-tests
-/usr/bin/libprivilege-control-test
 /etc/smack/test_smack_rules_full
 /etc/smack/test_smack_rules2
 /etc/smack/test_smack_rules3
@@ -93,22 +90,19 @@ echo "security-tests postinst done ..."
 /usr/bin/security-manager-tests
 /etc/smack/test_smack_rules
 /etc/smack/test_smack_rules_lnk
-/usr/share/privilege-control/*
-/etc/smack/test_privilege_control_DIR/*
-/usr/apps/*
-/usr/bin/test-app-efl
-/usr/bin/test-app-osp
-/usr/bin/test-app-wgt
+%{TZ_SYS_RW_APP}*
 /usr/bin/cynara-test
 /usr/bin/ckm-tests
 /usr/bin/ckm-integration-tests
-/usr/share/ckm-test/*
+/usr/bin/yaca-test
+%{ckm_test_dir}/*
 /etc/security-tests
 /usr/lib/security-tests/cynara-tests/plugins/single-policy/*
 /usr/lib/security-tests/cynara-tests/plugins/multiple-policy/*
 /usr/lib/security-tests/cynara-tests/plugins/test-agent/*
 /usr/bin/security-tests-inner-test
 /usr/bin/libwebappenc-tests
+%{_prefix}/share/yaca-test
 
 %postun
 id -u security_test_user  1>/dev/null 2>&1 && userdel security_test_user