From fb1da0eab211fc50eb9a39fa24c63f7fdd2d7fc4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 22 Jan 2016 16:29:36 +0100 Subject: [PATCH] tests: allow fallback to dbus-launch in case dbus-run-session is not available Like on Ubuntu 12.04 which is currently used by our Travic CI setup. --- tools/run-test-dbus-session.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/run-test-dbus-session.sh b/tools/run-test-dbus-session.sh index 1064e4122..0235d65b7 100755 --- a/tools/run-test-dbus-session.sh +++ b/tools/run-test-dbus-session.sh @@ -1,3 +1,10 @@ #!/bin/sh +if ! which dbus-run-session &>/dev/null; then + eval `dbus-launch --sh-syntax` + trap "kill $DBUS_SESSION_BUS_PID" EXIT + "$@" + exit $? +fi + dbus-run-session -- "$@"