build-depend on xvfb and run the tests under xvfb-run, since one needs a $DISPLAY

3 files changed, 7 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 88fcd86c..20b63523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ dbus (1.4.10-1) UNRELEASED; urgency=low
     - increase dependencies of dbus-1-dbg to allow for this
     - run the debug build's regression tests during build, but don't make
       failures fatal yet
+    - build-depend on xvfb and run the tests under xvfb-run, since one
+      needs a $DISPLAY
   * Run autoconf during build, and allow parallel building
   * Don't install dcop-howto.txt - this isn't DCOP
 
diff --git a/debian/control b/debian/control
index 70cea1b0..7928471c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,10 @@ Build-Depends: autotools-dev,
                libexpat-dev,
                libselinux1-dev [linux-any],
                libx11-dev,
+               xauth,
                xmlto,
-               xsltproc
+               xsltproc,
+               xvfb
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-utopia/dbus.git
 Vcs-Browser: http://git.debian.org/?p=pkg-utopia/dbus.git
diff --git a/debian/rules b/debian/rules
index af4ddef9..df72ad3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,8 @@ override_dh_auto_build:
 	xsltproc -o build/doc/dbus.devhelp doc/doxygen_to_devhelp.xsl build/doc/api/xml/index.xml
 
 override_dh_auto_test:
-	dh_auto_test
-	make -C build-debug -k check || echo "Tests failed, ignoring for now"
+	xvfb-run make -C build -k check || echo "Tests failed, ignoring for now"
+	xvfb-run make -C build-debug -k check || echo "Tests failed, ignoring for now"
 
 override_dh_auto_install:
 	dh_auto_install