projects
/
NetworkManager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5170d3a
)
tests: allow fallback to dbus-launch in case dbus-run-session is not available
author
Thomas Haller
<thaller@redhat.com>
Fri, 22 Jan 2016 15:29:36 +0000
(16:29 +0100)
committer
Thomas Haller
<thaller@redhat.com>
Fri, 22 Jan 2016 15:52:42 +0000
(16:52 +0100)
Like on Ubuntu 12.04 which is currently used by our Travic CI setup.
tools/run-test-dbus-session.sh
patch
|
blob
|
history
diff --git
a/tools/run-test-dbus-session.sh
b/tools/run-test-dbus-session.sh
index
1064e41
..
0235d65
100755
(executable)
--- 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 -- "$@"