diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-11 13:11:30 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-10 18:31:57 +0100 |
| commit | 7f25b33f1f3155424bfbc555b81c6b651aa5cecb (patch) | |
| tree | 3ab937efca67223e24a4944d9f7627010abbe198 /test | |
| parent | 1c485fc7be4068e3b16aff1bdbb6cbc2edcbeafd (diff) | |
| download | dbus-7f25b33f1f3155424bfbc555b81c6b651aa5cecb.tar.gz | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 88828516..ce05ec4c 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 \ |