From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 11 Mar 2011 13:11:30 +0000 (+0000)
Subject: Run integration tests on the installed dbus binaries during installcheck
X-Git-Tag: dbus-1.4.12~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f25b33f1f3155424bfbc555b81c6b651aa5cecb;p=thirdparty%2Fdbus.git

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 88828516d..ce05ec4c1 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					\