From 8f3bf5f985168d4347405b19add4c01860bb44c6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 11 Mar 2011 13:11:30 +0000 Subject: [PATCH 07/19] Run integration tests on the installed dbus binaries during installcheck Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570 --- test/Makefile.am | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 8882851..ce05ec4 100644 --- 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 \ -- 1.7.4.1