TEST_EXTENSIONS = .sh
-SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
+SH_LOG_DRIVER = $(LOG_DRIVER)
+
+LOG_COMPILER = \
+ @abs_top_builddir@/tools/dbus-run-session$(EXEEXT) \
+ --config-file=@abs_builddir@/uninstalled-session.conf \
+ --dbus-daemon=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
+ -- \
+ $(NULL)
SH_LOG_COMPILER = $(SHELL)
## note that TESTS has special meaning (stuff to use in make check)
AM_TESTS_ENVIRONMENT = \
export DBUS_TOP_BUILDDIR=@abs_top_builddir@; \
export DBUS_TOP_SRCDIR=@abs_top_srcdir@; \
+ export PATH="@abs_top_builddir@/bus:$$PATH"; \
export PYTHON=@PYTHON@; \
export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \
export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \
export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
+ unset DBUS_SESSION_BUS_ADDRESS; \
+ unset DBUS_SESSION_BUS_PID; \
$(NULL)
+uninstalled-session.conf: $(top_builddir)/bus/session.conf Makefile
+ $(SED) -e 's|<standard_session_servicedirs.*$$|<servicedir>@abs_top_builddir@/test/data/valid-service-files</servicedir>|g' \
+ -e 's|<include.*$$||g' \
+ < $< > $@
+
+check_DATA = \
+ uninstalled-session.conf \
+ $(NULL)
+
TESTS += \
run-test.sh \
run-test-systemserver.sh \