From 5e037404801fcf1f852a6a3ce08f4b8db598b762 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 14 Jan 2013 14:36:28 -0500 Subject: Rename localcheck to integrationcheck; update autopkgtest test. --- debian/tests/start-service | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'debian/tests') 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 -- cgit v1.2.3