From 7e41e741bdb7bd953e2f3831db050971a135c2dc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 6 Dec 2013 20:46:05 -0600 Subject: [PATCH] cleanup %check/tests --- kdelibs.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index e6b9fb4..d53c03e 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -27,9 +27,6 @@ %endif # enable tests (disabled by default) #global tests 1 -%if 0%{?tests} -%global _kde4_build_tests -DKDE4_BUILD_TESTS:BOOL=ON -%endif %global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver}) %global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver}) @@ -259,6 +256,12 @@ BuildRequires: graphviz BuildRequires: qt4-doc %endif +%if 0%{?tests} +%global _kde4_build_tests -DKDE4_BUILD_TESTS:BOOL=ON +# %%%check +BuildRequires: dbus-x11 xorg-x11-server-Xvfb +%endif + Provides: katepart = %{version}-%{release} Provides: katepart%{?_isa} = %{version}-%{release} Provides: kross(javascript) = %{version}-%{release} @@ -484,7 +487,7 @@ rm -fv %{buildroot}%{_mandir}/man1/kdecmake.1* %check %if 0%{?tests} -time make -C %{_target_platform}/ test ||: +time xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform}/ test ARGS="--verbose" ||: %endif