From 35ba62172d79ee41d9ecb9e77cabe41ef1080b69 Mon Sep 17 00:00:00 2001 From: Simon McVittie 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 in tests without picking up someone else's .service files. Signed-off-by: Simon McVittie --- 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