summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-03-11 12:45:08 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-06-10 18:31:51 +0100
commit1c485fc7be4068e3b16aff1bdbb6cbc2edcbeafd (patch)
tree5b5256cb9cf21f68bd3b4cb0a47060658312ff59
parent841352a73a0035b4dea90202df933d1ad72158fd (diff)
downloaddbus-1c485fc7be4068e3b16aff1bdbb6cbc2edcbeafd.tar.gz
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
-rw-r--r--test/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 0ec176e6..88828516 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@