From 447d04c20231000d842b75c65ac290497a64ef30 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 10 Mar 2011 18:41:39 +0000 Subject: [PATCH] Run some trivial integration tests on the installed dbus binaries Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570 --- test/Makefile.am | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index f0c3c1e..5241437 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -77,6 +77,11 @@ modular_tests = \ test-loopback \ test-relay +installcheck_tests = +installcheck_environment = \ + TEST_DBUS_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \ + TEST_CONFIG_FILES=@abs_top_srcdir@/test/data/valid-config-files + TESTS_ENVIRONMENT = \ TEST_DBUS_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ TEST_CONFIG_FILES=@abs_top_srcdir@/test/data/valid-config-files @@ -105,8 +110,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