fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-04 01:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Build installable helpers whenever any tests are enabled

Browse source 
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 <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2018-10-31 15:09:24 +00:00
parent 06b8055690
commit 168bbe146c
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/Makefile.am
View file

@ -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