fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-30 21:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Redirect XDG_DATA_HOME, XDG_DATA_DIRS somewhere harmless

Browse source 
We want to be able to use <standard_system_datadirs/> in tests
without picking up someone else's .service files.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99825
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Simon McVittie 2017-02-15 11:43:51 +00:00
parent 898ae926df
commit 867a600bf7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/Makefile.am
View file

@ -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); \