From 5e037404801fcf1f852a6a3ce08f4b8db598b762 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Mon, 14 Jan 2013 14:36:28 -0500
Subject: Rename localcheck to integrationcheck; update autopkgtest test.

---
 Makefile.am                |  2 --
 debian/tests/start-service | 16 ++++++++++++----
 tests/Makefile.am          |  8 ++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a406d44..8fb5d77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,4 @@ dist-hook:
 			echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
 
-localcheck:
-
 include $(top_srcdir)/Makefile.am.coverage
diff --git a/debian/tests/start-service b/debian/tests/start-service
index 1aeef94..7227cb2 100644
--- a/debian/tests/start-service
+++ b/debian/tests/start-service
@@ -1,12 +1,20 @@
 #!/bin/sh
 
-dbus-daemon --fork --print-address=4 --config-file /usr/share/aptdaemon/tests/dbus.conf --print-pid=5 4>/tmp/bus-addr 5>/tmp/pid-bus
+set -x
+set -e
 
-DBUS_SYSTEM_BUS_ADDRESS=`cat /tmp/bus-addr`
+if [ ! -d /var/run/dbus ]; then
+	mkdir /var/run/dbus
+fi
 
-/usr/sbin/console-kit-daemon &
+dbus-daemon --fork --print-address=4 --config-file /etc/dbus-1/system.conf --print-pid=5 4>/tmp/system-bus-addr 5>/tmp/system-bus-pid
+dbus-daemon --fork --session --print-address=4 --config-file 4>/tmp/session-bus-addr
+
+DBUS_SYSTEM_BUS_ADDRESS=`cat /tmp/system-bus-addr`
+DBUS_SESSION_BUS_ADDRESS=`cat /tmp/session-bus-addr`
 
+/usr/sbin/console-kit-daemon &
 /usr/lib/accountsservice/accounts-daemon &
 
-tests/test-service
+make -C tests integrationcheck
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9f9f961..c117c95 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,8 +3,8 @@ CLEANFILES =
 BUILT_SOURCES =
 check_PROGRAMS =
 
-localcheckdir = .
-localcheck_PROGRAMS =
+integrationcheckdir = .
+integrationcheck_PROGRAMS =
 
 ###
 ###
@@ -32,10 +32,10 @@ gschemas.compiled: Makefile
 	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
 
 
-localcheck:
+integrationcheck:
 	./test-service
 
-localcheck_PROGRAMS += test-service
+integrationcheck_PROGRAMS += test-service
 test_service_SOURCES = test-service.cc
 test_service_LDADD = \
 	$(TEST_SERVICE_LIBS) \
-- 
cgit v1.2.3