Run integration tests on the installed dbus binaries during installcheck

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 8882851..ce05ec4 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -76,9 +76,15 @@ modular_tests = \
        test-loopback \
        test-relay
 
+installcheck_tests =
+installcheck_environment = \
+       DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \
+       DBUS_TEST_DATA=@abs_top_builddir@/test/data \
+       DBUS_TEST_USE_INSTALLED=1
+
 TESTS_ENVIRONMENT = \
        DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
-       DBUS_TEST_DATA=@abs_top_srcdir@/test/data
+       DBUS_TEST_DATA=@abs_top_builddir@/test/data
 
 test_loopback_SOURCES = loopback.c
 test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
@@ -97,8 +103,13 @@ test_relay_LDADD = $(top_builddir)/dbus/libdbus-1.la \
 if DBUS_ENABLE_MODULAR_TESTS
 noinst_PROGRAMS += $(modular_tests)
 TESTS += $(modular_tests)
+installcheck_tests += $(modular_tests)
 endif DBUS_ENABLE_MODULAR_TESTS
 
+installcheck-local:
+       $(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \
+               TESTS_ENVIRONMENT='$$(installcheck_environment)'
+
 ## keep these in creation order, i.e. uppermost dirs first 
 TESTDIRS=                                      \
        data                                    \