On 25.02.25 19:08, Christopher Obbard wrote: > Hi Jan, > > On Tue, 25 Feb 2025 at 18:05, Jan Kiszka <jan.kis...@siemens.com> wrote: >> >> On 25.02.25 18:56, Christopher Obbard wrote: >>> Hi Jan, >>> >>> On Tue, 25 Feb 2025 at 16:48, Jan Kiszka <jan.kis...@siemens.com> wrote: >>>> On 24.02.25 17:47, Christopher Obbard wrote: >>>>> For some builds, e.g. inside a minimal buildroot image, we may not want >>>>> the >>>>> tests to be built. Add an option --disable-tests to configure to disable >>>>> building the tests. >>>>> >>>>> Signed-off-by: Christopher Obbard <christopher.obb...@linaro.org> >>>>> --- >>>>> Makefile.am | 9 ++++++++- >>>>> configure.ac | 12 +++++++++++- >>>>> tools/tests/Makefile.am | 3 +++ >>>>> 3 files changed, 22 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/Makefile.am b/Makefile.am >>>>> index >>>>> bb97df255dfb9c8a145eba3ed8dcc58ab9bd124b..160d211c3f12d14cf7a136e0dd36e21fa5f0673a >>>>> 100644 >>>>> --- a/Makefile.am >>>>> +++ b/Makefile.am >>>>> @@ -369,8 +369,15 @@ clean-local-completion-pycache: >>>>> >>>>> check-valgrind-local: $(GEN_VERSION_H) >>>>> >>>>> +SUBDIRS = . >>>>> + >>>>> # Tests depend on libraries being built - start with "." >>>>> -SUBDIRS = . tools/tests >>>>> +if BUILD_TESTS >>>>> +SUBDIRS += tools/tests >>>>> +endif >>>>> + >>>>> +# Include the tests always for distribution >>>>> +EXTRA_DIST = tools/tests >>>> >>>> That line is new, isn't it? Why do we need that now? >>> >>> This was so I could be sure that tools/tests is always included. To be >>> honest, I don't know autotools so this is most likely not right ;-). >>> I will remove this line and send v2. >>> >> >> Ah, you were concerned that if someone does "configure --disable-tests" >> and then "make dist", the folder would be missing? Maybe worth a try - >> I'm not automake guru either. :) > > Exactly that, but I doubt that's going to happen in practice ever ;-). > In V1 I actually redefined EXTRA_DIST anyway, it seems. So it was broken > anyway. > I removed that EXTRA_DIST part in V2. >
Just tested (after fixing "make dist" which NEVER worked): automake seems to also consider those conditional SUBDIRS, automatically. Jan -- Siemens AG, Foundational Technologies Linux Expert Center -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to efibootguard-dev+unsubscr...@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/efibootguard-dev/c05bd8ed-5b47-4c25-a3bc-ee07e75b21d5%40siemens.com.
