diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-18 15:07:33 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-19 14:25:57 +0100 |
| commit | 30dc2928196aefd112db7047a98900c047f27bae (patch) | |
| tree | a32e1ff7e00bc86c8032f70dca964442eb9c3c27 | |
| parent | 1978058f83f3bb30196985302fd917cb43473cfa (diff) | |
| download | telepathy-mission-control-30dc2928196aefd112db7047a98900c047f27bae.tar.gz | |
run-mc.sh.in: set DBUS_SYSTEM_BUS_ADDRESS
This is used in the "installed" case, and this change is necessary to
catch up with exec-with-log.sh.in in the "uninstalled" case. We want
to use the fake NetworkManager, ConnMan etc., not the real ones.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69542
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
| -rw-r--r-- | tests/twisted/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/twisted/run-test.sh.in | 4 | ||||
| -rwxr-xr-x | tests/twisted/tools/run-mc.sh.in | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index 40d327b9..7f8710fd 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -167,7 +167,11 @@ config.py: Makefile echo "HAVE_NM = $(HAVE_NM_PYBOOL)"; \ } > $@ -BUILT_SOURCES = config.py +BUILT_SOURCES = \ + config.py \ + mc-twisted-tests.list \ + run-test.sh \ + $(NULL) AM_CFLAGS = $(ERROR_CFLAGS) diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index cbd2e773..170b73b1 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -116,13 +116,13 @@ for i in $list ; do case "$e" in (0) echo "PASS: $i" - if test -z "MC_TEST_KEEP_TEMP"; then + if test -z "$MC_TEST_KEEP_TEMP"; then rm -fr "$tmp" fi ;; (77) echo "SKIP: $i" - if test -z "MC_TEST_KEEP_TEMP"; then + if test -z "$MC_TEST_KEEP_TEMP"; then rm -fr "$tmp" fi ;; diff --git a/tests/twisted/tools/run-mc.sh.in b/tests/twisted/tools/run-mc.sh.in index 458a4611..922eeb5b 100755 --- a/tests/twisted/tools/run-mc.sh.in +++ b/tests/twisted/tools/run-mc.sh.in @@ -2,4 +2,10 @@ ulimit -c unlimited + +# Our fake session bus is also a fake system bus, but it doesn't know that +# when it service-activates us +DBUS_SYSTEM_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" +export DBUS_SYSTEM_BUS_ADDRESS + @libexecdir@/mission-control-5 |