From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 11 Mar 2011 12:45:08 +0000 (+0000)
Subject: Give the tests DBUS_TEST_DAEMON and DBUS_TEST_DATA in their environment
X-Git-Tag: dbus-1.4.12~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c485fc7be4068e3b16aff1bdbb6cbc2edcbeafd;p=thirdparty%2Fdbus.git

Give the tests DBUS_TEST_DAEMON and DBUS_TEST_DATA in their environment

This will allow modular tests to spawn a dbus-daemon with a specified
config file; nothing uses this just yet.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570
---

diff --git a/test/Makefile.am b/test/Makefile.am
index 0ec176e62..88828516d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -76,6 +76,10 @@ modular_tests = \
 	test-loopback \
 	test-relay
 
+TESTS_ENVIRONMENT = \
+	DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
+	DBUS_TEST_DATA=@abs_top_srcdir@/test/data
+
 test_loopback_SOURCES = loopback.c
 test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 test_loopback_LDFLAGS = @R_DYNAMIC_LDFLAG@