From 81b461afaa9836be7fdf8f10dec50c33836af632 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Kundr=C3=A1t?= Date: Mon, 7 Jan 2013 21:41:54 +0100 Subject: [PATCH] OBS: the new unit tests actually require the X connection --- packaging/trojita-nightly.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packaging/trojita-nightly.spec b/packaging/trojita-nightly.spec index 8e517557..a331578d 100644 --- a/packaging/trojita-nightly.spec +++ b/packaging/trojita-nightly.spec @@ -33,11 +33,13 @@ Source: trojita-%{version}.tar.bz2 %if 0%{?fedora} BuildRequires: qt-webkit-devel >= 4.6 BuildRequires: libstdc++-devel gcc-c++ +BuildRequires: xorg-x11-server-Xvfb %define qmake_command qmake-qt4 %endif %if 0%{?rhel_version} || 0%{?centos_version} BuildRequires: qtwebkit-devel >= 2.1 BuildRequires: libstdc++-devel gcc-c++ +BuildRequires: xorg-x11-server-Xvfb %define qmake_command qmake-qt4 %endif %if 0%{?suse_version} || 0%{?sles_version} @@ -45,8 +47,10 @@ BuildRequires: pkgconfig(QtGui) >= 4.6 BuildRequires: pkgconfig(QtWebKit) >= 4.6 BuildRequires: libQtWebKit-devel BuildRequires: update-desktop-files +BuildRequires: xorg-x11-Xvfb %define qmake_command qmake %endif +%define X_display ":98" BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,6 +93,9 @@ make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install %{_datadir}/trojita/locale/trojita_common_*.qm %check +export DISPLAY=%{X_display} +Xvfb %{X_display} >& Xvfb.log & +trap "kill $! || true" EXIT make test %changelog -- 2.11.4.GIT