Attachment 132450 Details for Bug 101698 – [1/3] name-test: Backport dbus-run-session wrapper from git master

[patch] [1/3] name-test: Backport dbus-run-session wrapper from git master

0001-name-test-Backport-dbus-run-session-wrapper-from-git.patch (text/plain), 2.70 KB, created by Simon McVittie on 2017-07-05 14:49:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-07-05 14:49:52 UTC

Size: 2.70 KB

patch

obsolete

>From 8bd6dbf4484453dcb352a9106ab9f1a800510262 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Wed, 5 Jul 2017 15:28:08 +0100
>Subject: [PATCH 1/3] name-test: Backport dbus-run-session wrapper from git
> master
>
>test-pending-call-disconnected relies on being run under a session bus.
>On master, the TESTS in this directory all get that treatment, but
>in dbus-1.10 they do not. This caused test-pending-call-disconnected
>to fail in minimal environments like travis-ci where there is no
>developer-initiated session bus.
>
>Backport part of commit ec6b220 "name-test: run most C tests directly,
>not via run-test.sh" to wrap it in dbus-run-session. This is better
>than putting it in run-test.sh because this way, its TAP output is
>parsed directly by Automake.
>
>It also has the side benefit of exercising dbus-run-session in the
>automated tests.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/name-test/Makefile.am | 22 +++++++++++++++++++++-
> 1 file changed, 21 insertions(+), 1 deletion(-)
>
>diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
>index 9982e454..c90a4721 100644
>--- a/test/name-test/Makefile.am
>+++ b/test/name-test/Makefile.am
>@@ -9,7 +9,15 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
> 
> TEST_EXTENSIONS = .sh
> 
>-SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
>+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
>+SH_LOG_DRIVER = $(LOG_DRIVER)
>+
>+LOG_COMPILER = \
>+	@abs_top_builddir@/tools/dbus-run-session$(EXEEXT) \
>+	--config-file=@abs_builddir@/uninstalled-session.conf \
>+	--dbus-daemon=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
>+	-- \
>+	$(NULL)
> SH_LOG_COMPILER = $(SHELL)
> 
> ## note that TESTS has special meaning (stuff to use in make check)
>@@ -22,12 +30,24 @@ if DBUS_UNIX
> AM_TESTS_ENVIRONMENT = \
>         export DBUS_TOP_BUILDDIR=@abs_top_builddir@; \
>         export DBUS_TOP_SRCDIR=@abs_top_srcdir@; \
>+        export PATH="@abs_top_builddir@/bus:$$PATH"; \
>         export PYTHON=@PYTHON@; \
>         export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \
>         export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \
>         export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
>+        unset DBUS_SESSION_BUS_ADDRESS; \
>+        unset DBUS_SESSION_BUS_PID; \
>         $(NULL)
> 
>+uninstalled-session.conf: $(top_builddir)/bus/session.conf Makefile
>+       $(SED) -e 's|<standard_session_servicedirs.*$$|<servicedir>@abs_top_builddir@/test/data/valid-service-files</servicedir>|g' \
>+               -e 's|<include.*$$||g' \
>+               < $< > $@
>+
>+check_DATA = \
>+       uninstalled-session.conf \
>+       $(NULL)
>+
> TESTS += \
> 	run-test.sh \
> 	run-test-systemserver.sh \
>-- 
>2.13.2
>

Actions: View | Splinter Review

Attachments on bug 101698: 132450 | 132451 | 132452 | 132453 | 132482

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.