telepathy-mission-control: run-mc.sh.in: set DBUS_SYSTEM_BUS_ADDRESS

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 30dc2928196aefd112db7047a98900c047f27bae
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=30dc2928196aefd112db7047a98900c047f27bae

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 18 15:07:33 2013 +0100

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 at collabora.co.uk>

---

 tests/twisted/Makefile.am        |    6 +++++-
 tests/twisted/run-test.sh.in     |    4 ++--
 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 40d327b..7f8710f 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 cbd2e77..170b73b 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 458a461..922eeb5 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