X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fsecurity-tests.spec;h=4efc6b04afd6d9df61e6b7aeed5b5afe4fde9090;hb=bd7c4954c7134b32df83569b2fd26959af313091;hp=78e840cd41987e3abcbf84a0f199c5b1c61e7f2b;hpb=05c063407fb2c6a1fe9f61d47f80f802e8e37fb1;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index 78e840c..4efc6b0 100644
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -11,24 +11,29 @@ 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(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
-Requires(post): gum-utils
-Requires(postun): gum-utils
-Requires(postun): %{_bindir}/id
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(libgum) >= 1.0.5
 Requires: perf
+Requires: gdb
+Requires: diffutils
+
+%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.
@@ -42,11 +47,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 \
-        -DAPP_USER=security-tests-app
+        -DAPP_USER="security_test_user" \
+        -DCKM_TEST_DIR=%{ckm_test_dir} \
+        -DCKM_RW_DATA_DIR=%{ckm_rw_data_dir}
 make %{?jobs:-j%jobs}
 
 %install
@@ -54,54 +65,48 @@ make %{?jobs:-j%jobs}
 ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
 
 %post
-%{_bindir}/gum-utils --add-user --username=security-tests-app --usertype=4 --offline
-
-find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755 {} +
-find /usr/apps/test_DIR/ -type f -name exec -exec chmod 0755 {} +
+id -u  security_test_user 1>/dev/null 2>&1 || \
+    gum-utils -o -a --username=security_test_user --usertype=normal
 
-# Load permissions templates
-api_feature_loader --verbose
+# Reload dbus daemon to apply newly installed configuration
+systemctl reload dbus
 
 echo "security-tests postinst done ..."
 
-%postun
-%{_bindir}/gum-utils --delete-user --uid=`%{_bindir}/id -u security-tests-app` --offline
-
 %files
 %manifest %{name}.manifest
 %defattr(-, root, root, -)
 /usr/bin/security-tests.sh
 /usr/bin/security-tests-all.sh
-/usr/bin/tests-summary.sh
 /usr/bin/test-performance-check.sh
 
 /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/test_DIR/*
-/home/security-tests-app/test_DIR
-/usr/bin/test-app-efl
-/usr/bin/test-app-osp
-/usr/bin/test-app-wgt
+/usr/apps/*
 /usr/bin/cynara-test
 /usr/bin/ckm-tests
-/usr/share/ckm-test/*
+/usr/bin/ckm-integration-tests
+/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/security-tests-cleanup-test
+/usr/bin/cleanup_test.sh
+/usr/bin/libwebappenc-tests
+%{_prefix}/share/yaca-test
+%dir %{_prefix}/share/security-tests-cleanup-test
+%{_prefix}/share/security-tests-cleanup-test/*
 
+%postun
+id -u security_test_user 1>/dev/null 2>&1 && gum-utils -o -d --uid=`id -u security_test_user`