Attachment 86085 Details for Bug 69542 – 05/10] run-mc.sh.in: set DBUS_SYSTEM_BUS_ADDRESS

[patch] 05/10] run-mc.sh.in: set DBUS_SYSTEM_BUS_ADDRESS

0005-run-mc.sh.in-set-DBUS_SYSTEM_BUS_ADDRESS.patch (text/plain), 2.01 KB, created by Simon McVittie on 2013-09-18 18:47:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-18 18:47:42 UTC

Size: 2.01 KB

patch

obsolete

>From d8125a72bffaac2e4738708db0ea5aa98778f048 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 18 Sep 2013 15:07:33 +0100
>Subject: [PATCH 05/10] 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.
>---
> 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
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 69542: 86081 | 86082 | 86083 | 86084 | 86085 | 86086 | 86087 | 86088 | 86089 | 86090

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.