diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-15 16:05:03 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-15 16:10:46 +0100 |
| commit | bc40410024314a700ef70702502f868630e02e8b (patch) | |
| tree | 6ad6da645e4572e665b49d7b2d34b7c8748cf06e | |
| parent | e829ba1c802f8b06bf678772046833d0a1c6fd0b (diff) | |
with-session-bus: import --also-for-system from Salut
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | tests/twisted/tools/with-session-bus.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh index a445573a..1b8990e6 100644 --- a/tests/twisted/tools/with-session-bus.sh +++ b/tests/twisted/tools/with-session-bus.sh @@ -44,6 +44,10 @@ while test "z$1" != "z--"; do dbus_daemon_args="$dbus_daemon_args $1" shift ;; + --also-for-system) + with_system_bus=1 + shift + ;; *) usage ;; @@ -80,6 +84,11 @@ e=0 DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`" export DBUS_SESSION_BUS_ADDRESS +if [ -n "$with_system_bus" ] ; then + DBUS_SYSTEM_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" + export DBUS_SYSTEM_BUS_ADDRESS +fi + if [ -n "$WITH_SESSION_BUS_FORK_DBUS_MONITOR" ] ; then echo "Forking dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT" >&2 dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT \ |