Attachment 116074 Details for Bug 89280 – tests: use the new bus setup for `make installcheck`

[patch] tests: use the new bus setup for `make installcheck`

0005-tests-use-the-new-bus-setup-for-make-installcheck.patch (text/plain), 1.56 KB, created by Simon McVittie on 2015-05-27 10:46:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-05-27 10:46:18 UTC

Size: 1.56 KB

patch

obsolete

>From 0b812210892b32afde1b80be7492926bf83c9c54 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 27 May 2015 11:42:44 +0100
>Subject: [PATCH 5/5] tests: use the new bus setup for `make installcheck`
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280
>---
> test/Makefile.am       | 2 +-
> test/test-utils-glib.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 1a43c07..9540a2c 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -169,7 +169,7 @@ installcheck_environment = \
> 	export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
> 	export DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT); \
> 	export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \
>-	export DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir); \
>+	export DBUS_TEST_DATADIR=$(DESTDIR)$(datadir); \
> 	${NULL}
> 
> AM_TESTS_ENVIRONMENT = \
>diff --git a/test/test-utils-glib.c b/test/test-utils-glib.c
>index 667f72a..a40c30b 100644
>--- a/test/test-utils-glib.c
>+++ b/test/test-utils-glib.c
>@@ -240,10 +240,10 @@ test_get_dbus_daemon (const gchar *config_file,
>           "--config-file=%s/%s",
>           g_getenv ("DBUS_TEST_DATA"), config_file);
>     }
>-  else if (g_getenv ("DBUS_TEST_SYSCONFDIR") != NULL)
>+  else if (g_getenv ("DBUS_TEST_DATADIR") != NULL)
>     {
>       arg = g_strdup_printf ("--config-file=%s/dbus-1/session.conf",
>-          g_getenv ("DBUS_TEST_SYSCONFDIR"));
>+          g_getenv ("DBUS_TEST_DATADIR"));
>     }
>   else if (g_getenv ("DBUS_TEST_DATA") != NULL)
>     {
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89280: 113750 | 113751 | 113819 | 113820 | 113821 | 113917 | 113918 | 116061 | 116073 | 116074

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.