aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-01-14 14:36:28 -0500
committerMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-01-14 14:36:28 -0500
commit5e037404801fcf1f852a6a3ce08f4b8db598b762 (patch)
tree632d33294859987b8078bdc712cc6b2cac52dd04 /debian
parent39ec64fb84b26592e134cddb465b659d9ad553e3 (diff)
downloadayatana-indicator-session-5e037404801fcf1f852a6a3ce08f4b8db598b762.tar.gz
ayatana-indicator-session-5e037404801fcf1f852a6a3ce08f4b8db598b762.tar.bz2
ayatana-indicator-session-5e037404801fcf1f852a6a3ce08f4b8db598b762.zip
Rename localcheck to integrationcheck; update autopkgtest test.
Diffstat (limited to 'debian')
-rw-r--r--debian/tests/start-service16
1 files changed, 12 insertions, 4 deletions
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