Attachment 129706 Details for Bug 99825 – test: Redirect XDG_DATA_HOME, XDG_DATA_DIRS somewhere harmless

[patch] test: Redirect XDG_DATA_HOME, XDG_DATA_DIRS somewhere harmless

0007-test-Redirect-XDG_DATA_HOME-XDG_DATA_DIRS-somewhere-.patch (text/plain), 1.47 KB, created by Simon McVittie on 2017-02-17 19:08:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-02-17 19:08:28 UTC

Size: 1.47 KB

patch

obsolete

>From 35ba62172d79ee41d9ecb9e77cabe41ef1080b69 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 15 Feb 2017 11:43:51 +0000
>Subject: [PATCH 07/12] test: Redirect XDG_DATA_HOME, XDG_DATA_DIRS somewhere
> harmless
>
>We want to be able to use <standard_system_datadirs/> in tests
>without picking up someone else's .service files.
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> test/Makefile.am | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 7c712fa2..61693982 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -227,6 +227,8 @@ installable_test_meta_with_config = \
> 
> installcheck_tests =
> installcheck_environment = \
>+	export XDG_DATA_HOME=@abs_top_builddir@/test/XDG_DATA_HOME; \
>+	export XDG_DATA_DIRS=@abs_top_builddir@/test/XDG_DATA_DIRS:$(DESTDIR)$(datadir); \
> 	export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
> 	export DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT); \
> 	export DBUS_TEST_DBUS_LAUNCH=$(DESTDIR)$(bindir)/dbus-launch$(EXEEXT); \
>@@ -237,6 +239,8 @@ installcheck_environment = \
> 	${NULL}
> 
> AM_TESTS_ENVIRONMENT = \
>+	export XDG_DATA_HOME=@abs_top_builddir@/test/XDG_DATA_HOME; \
>+	export XDG_DATA_DIRS=@abs_top_builddir@/test/XDG_DATA_DIRS; \
> 	export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
> 	export DBUS_FATAL_WARNINGS=1; \
> 	export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 99825: 129626 | 129627 | 129628 | 129629 | 129630 | 129631 | 129632 | 129633 | 129634 | 129635 | 129636 | 129700 | 129701 | 129702 | 129703 | 129704 | 129705 | 129706 | 129707 | 129708 | 129709 | 129710 | 129711 | 129712 | 129713 | 129714 | 129715 | 129716 | 129717 | 129718 | 129719 | 129721 | 129722 | 129762 | 129763 | 129764 | 129765 | 129766 | 129767 | 129768 | 129769 | 129770 | 129771 | 129773 | 129774 | 129775 | 129776 | 129777 | 129778 | 129789 | 129791 | 129792 | 129800 | 129804

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.