diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 16:43:23 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 16:43:23 +0100 |
| commit | cdfea3c5a600a18f2621c6249a374951496685ba (patch) | |
| tree | 614c59d0bd508e2d679ca9d72faf5a1ca3dd8a7b | |
| parent | 060e148bd71f3989861ab374dba89cc20278fcec (diff) | |
| download | telepathy-mission-control-cdfea3c5a600a18f2621c6249a374951496685ba.tar.gz | |
Merge fd.o #63119 from telepathy-glib
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63119
| -rw-r--r-- | tests/twisted/tools/with-session-bus.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh index 77abb853..bd213c71 100644 --- a/tests/twisted/tools/with-session-bus.sh +++ b/tests/twisted/tools/with-session-bus.sh @@ -81,6 +81,12 @@ if [ -n "$CHECK_TWISTED_VERBOSE" ] || [ -n "$VERBOSE_TESTS" ]; then fi e=0 + +# These might be non-null when run from e.g. gnome-terminal 3.8, which uses +# an activatable service for its windows; we don't want to inherit them either +unset DBUS_STARTER_ADDRESS +unset DBUS_STARTER_BUS_TYPE + DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`" export DBUS_SESSION_BUS_ADDRESS |