From a1e9fcfdadcba3038e21eed336f207c98cee3ede Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Jul 18 2013 19:48:07 +0000
Subject: Enable all tests


This is fairly hacky, but such is the state of "make check" and rpm.

https://bugzilla.redhat.com/show_bug.cgi?id=955532

---

diff --git a/0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch b/0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch
new file mode 100644
index 0000000..1f2db48
--- /dev/null
+++ b/0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch
@@ -0,0 +1,29 @@
+From 116f212581c93dba56ce5bc7b3f28237b2940145 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 18 Jul 2013 15:14:58 -0400
+Subject: [PATCH] name-test: Don't run test-autolaunch if we don't have dbus-launch
+
+libdbus will look for its compiled-in path to find dbus-launch, and
+not find it when running in a buildroot that doesn't have dbus
+installed (the typical case for pbuilder/mock).
+---
+ test/name-test/run-test.sh |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh
+index cad5937..0bb0aee 100755
+--- a/test/name-test/run-test.sh
++++ b/test/name-test/run-test.sh
+@@ -57,4 +57,8 @@ elif ! $PYTHON $DBUS_TOP_SRCDIR/test/name-test/test-activation-forking.py; then
+ fi
+ 
+ echo "running test-autolaunch"
+-${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch failed"
++if which dbus-launch 2>/dev/null; then
++    ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch failed"
++else
++    echo "Skipping test-autolaunch, no dbus-launch in $PATH"
++fi
+-- 
+1.7.1
+
diff --git a/dbus.spec b/dbus.spec
index 0bd4031..f2a6f9d 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -13,7 +13,7 @@ Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
 Version: 1.6.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 #VCS: git:git://git.freedesktop.org/git/dbus/dbus
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -40,8 +40,17 @@ Requires: libselinux%{?_isa} >= %{libselinux_version}
 Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires(pre): /usr/sbin/useradd
 
+# Note: These is only required for --enable-tests; when bootstrapping,
+# you can remove this and drop the --enable-tests configure argument.
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: dbus-python
+BuildRequires: pygobject2
+BuildRequires: /usr/bin/Xvfb
+
 # FIXME this should be upstreamed; need --daemon-bindir=/bin and --bindir=/usr/bin or something?
 Patch0: bindir.patch
+Patch1: 0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch
 
 %description
 D-BUS is a system for sending messages between applications. It is
@@ -91,6 +100,7 @@ in this separate package so server systems need not install X.
 /bin/chmod 0644 COPYING ChangeLog NEWS
 
 %patch0 -p1 -b .bindir
+%patch1 -p1
 
 %build
 if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi
@@ -134,9 +144,13 @@ mkdir -p %{buildroot}/var/lib/dbus
 
 %check
 if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi
-%configure %{dbus_common_config_opts} --enable-asserts --enable-verbose-mode
+%configure %{dbus_common_config_opts} --enable-asserts --enable-verbose-mode --enable-tests
 
 make clean
+# TODO: better script for this...
+export DISPLAY=42
+{ Xvfb :${DISPLAY} -nolisten tcp -auth /dev/null >/dev/null 2>&1 &
+  trap "kill -15 $! " 0 HUP INT QUIT TRAP TERM; };
 DBUS_TEST_SLOW=1 make check
 
 %clean
@@ -225,6 +239,13 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Jul 18 2013 Colin Walters <walters@verbum.org> - 1:1.6.12-2
+- Enable all upstream tests
+  Resolves: #955532
+  This is fairly hacky; a much better replacement would be
+  something like the InstalledTests system.  But we have to live
+  with rpm and stuff for now...
+
 * Mon Jun 17 2013 Colin Walters <walters@verbum.org> - 1:1.6.12-1
 - New upstream release
 - CVE-2013-2168