X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fsecurity-tests.spec;h=8c525c625a002296300bc1552d0f606090f95613;hb=d37b8e5521ef93e70972ca29d7ebab65a7a41dd4;hp=54174ce39441688843f78793c36f927f29fcfa29;hpb=831c948963b1181079c8de798fe1c85dea38560b;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index 54174ce..8c525c6 100644
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -11,8 +11,6 @@ BuildRequires: cmake
 BuildRequires: libattr-devel
 BuildRequires: pkgconfig(libcap)
 BuildRequires: pkgconfig(libsmack)
-BuildRequires: pkgconfig(libprivilege-control)
-BuildRequires: pkgconfig(security-server)
 BuildRequires: pkgconfig(security-manager)
 BuildRequires: pkgconfig(key-manager)
 BuildRequires: pkgconfig(dlog)
@@ -20,7 +18,6 @@ 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
@@ -30,7 +27,9 @@ 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.
@@ -44,13 +43,17 @@ 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"
         -DSECURITY_MDFPP_STATE_ENABLE=1 \
 %endif
         -DCMAKE_VERBOSE_MAKEFILE=ON       \
-        -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db
+        -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db \
+        -DAPP_USER="security_test_user" \
+        -DCKM_TEST_DIR=%{ckm_test_dir} \
+        -DCKM_RW_DATA_DIR=%{ckm_rw_data_dir}
 make %{?jobs:-j%jobs}
 
 %install
@@ -58,16 +61,8 @@ 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
 
 echo "security-tests postinst done ..."
 
@@ -81,34 +76,26 @@ 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
-/usr/bin/security-server-tests-client-smack
-/usr/bin/security-server-tests-server
-/usr/bin/security-server-tests-password
-/usr/bin/security-server-tests-privilege
-/usr/bin/security-server-tests-stress
 /etc/smack/test_smack_rules_full
 /etc/smack/test_smack_rules2
 /etc/smack/test_smack_rules3
 /etc/smack/test_smack_rules4
-/usr/bin/security-server-tests-mt
-/usr/bin/security-server-tests-api-speed
 /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
 /usr/bin/cynara-test
 /usr/bin/ckm-tests
-/usr/share/ckm-test/*
+/usr/bin/ckm-privileged-tests
+/usr/bin/ckm-tests-on-onlycap.sh
+/usr/bin/ckm-integration-tests
+%{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
+
+%postun
+id -u security_test_user  1>/dev/null 2>&1 && userdel security_test_user