tests: general fix for tests setup

[platform/upstream/dbus.git] / packaging / dbus.spec

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index afaad50..50d1da3 100644 (file)
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -220,15 +220,22 @@ install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 rm -rf %{buildroot}%{_datadir}/doc
 
 # build test binaries and copy test data
-%define relative_dbus_tests_base_dir %{_prefix}/lib/dbus-tests
+%define relative_dbus_tests_base_dir %{_libdir}/dbus-tests
 %define dbus_tests_base_dir %{buildroot}%{relative_dbus_tests_base_dir}
+%define dbus_installed_tests_dir %{_libdir}/dbus/installed-tests/dbus
 mkdir -p %{dbus_tests_base_dir}/test-suites/dbus-tests/
 
 mkdir -p %{dbus_tests_base_dir}/runner/
-%__cc %{_builddir}/%{name}-%{version}/test-runner.c -o %{dbus_tests_base_dir}/runner/dbus-tests
-cp -fr %{buildroot}%{_libdir}/dbus/installed-tests/dbus/* %{dbus_tests_base_dir}/test-suites/dbus-tests/
-rm -fr %{buildroot}%{_libdir}/dbus/installed-tests/dbus
+%__cc %{_builddir}/%{name}-%{version}/test-runner.c -g -o %{dbus_tests_base_dir}/runner/dbus-tests
 rm -fr %{buildroot}/usr/share/installed-tests/dbus
+# The tests are installed in standard directory for dbus tests.
+# However, we need to have the tests also available for dbus-integration-tests package.
+# Thus, we link selected tests to our dbus-integration-tests directory
+for f in manual-dir-iter manual-tcp test-corrupt test-dbus-daemon \
+                test-dbus-daemon-eavesdrop test-fdpass test-loopback test-marshal \
+                test-monitor test-printf test-refs test-relay test-sd-activation \
+                test-shell test-syntax test-syslog test-uid-permissions
+do ln -s %{dbus_installed_tests_dir}/$f %{dbus_tests_base_dir}/test-suites/dbus-tests/$f; done
 
 %if %{with coverage}
 %define relative_cov_lib_dir %{relative_dbus_tests_base_dir}/coverage-libs
@@ -315,8 +322,9 @@ install -m 0644 coverage-objects/* %{cov_lib_dir}/objects
 %files tests
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%{_prefix}/lib/dbus-tests/test-suites/dbus-tests
-%{_prefix}/lib/dbus-tests/runner/dbus-tests
+%{_libdir}/dbus-tests/test-suites/dbus-tests
+%{_libdir}/dbus-tests/runner/dbus-tests
+%{_libdir}/dbus/installed-tests
 
 %if %{with coverage}
 %files coverage