From 168bbe146c301d4ca515d8e8ac57c1eda2fa06c7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 31 Oct 2018 15:09:24 +0000 Subject: [PATCH] tests: Build installable helpers whenever any tests are enabled We might need these to run tests at build-time, so we should build them whenever either modular or embedded tests are enabled, even if installed-tests aren't. We haven't noticed this bug until now because $(installable_helpers) only contained test-apparmor-activation, which isn't normally needed at build-time because the AppArmor test can only work when run as root. Signed-off-by: Simon McVittie --- test/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 399c3370d..539acb6c1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -424,10 +424,18 @@ if DBUS_ENABLE_INSTALLED_TESTS nobase_testmeta_DATA += $(installable_test_meta) nobase_testmeta_DATA += $(installable_test_meta_with_config) else !DBUS_ENABLE_INSTALLED_TESTS - noinst_PROGRAMS += $(installable_tests) $(installable_manual_tests) + noinst_PROGRAMS += $(installable_helpers) + noinst_PROGRAMS += $(installable_manual_tests) + noinst_PROGRAMS += $(installable_tests) endif !DBUS_ENABLE_INSTALLED_TESTS -endif DBUS_ENABLE_MODULAR_TESTS +else !DBUS_ENABLE_MODULAR_TESTS + +if DBUS_ENABLE_EMBEDDED_TESTS + noinst_PROGRAMS += $(installable_helpers) +endif DBUS_ENABLE_EMBEDDED_TESTS + +endif !DBUS_ENABLE_MODULAR_TESTS # If we're installing the tests into a DESTDIR we can't run them # again using the installed copy, because we don't know how to -- 2.47.3