Disable the build-time tests for now, they need more upstream work before they'll pass in a minimal build chroot

3 files changed, 4 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index a792d586..92132f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dbus (1.4.10-2) UNRELEASED; urgency=low
   * Disable -Wl,--gc-sections and related flags: the size decrease is
     negligible, and these options currently segfault ld on armel and mips*
     (Closes: #628834)
+  * Disable the build-time tests for now, they need more upstream work before
+    they'll pass in a minimal build chroot
 
  -- Simon McVittie <smcv@debian.org>  Wed, 01 Jun 2011 18:01:41 +0100
 
diff --git a/debian/control b/debian/control
index 589293f3..4b3e6304 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,8 @@ Build-Depends: autotools-dev,
                libexpat-dev,
                libselinux1-dev [linux-any],
                libx11-dev,
-               xauth,
                xmlto,
-               xsltproc,
-               xvfb
+               xsltproc
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-utopia/dbus.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-utopia/dbus.git
diff --git a/debian/rules b/debian/rules
index 8dc54f2c..7c8f6e39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,8 +52,7 @@ 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:
-	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"
+	: # tests need more environmental setup at the moment
 
 override_dh_auto_install:
 	dh_auto_install