On Thu, Sep 04, 2025 at 05:25:54PM +0200, Pablo Neira Ayuso wrote:
> On Thu, Sep 04, 2025 at 05:25:02PM +0200, Pablo Neira Ayuso wrote:
> > On Wed, Sep 03, 2025 at 07:22:59PM +0200, Phil Sutter wrote:
> > > With all test suites running all variants by default, add the various
> > > testsuite runners to TESTS variable so 'make check' will execute them.
> > >
> > > Introduce --enable-distcheck configure flag for internal use during
> > > builds triggered by 'make distcheck'. This flag will force TESTS
> > > variable to remain empty, so 'make check' run as part of distcheck will
> > > not call any test suite: Most of the test suites require privileged
> > > execution, 'make distcheck' usually doesn't and probably shouldn't.
> > > Assuming the latter is used during the release process, it may even not
> > > run on a machine which is up to date enough to generate meaningful test
> > > suite results. Hence spare the release process from the likely pointless
> > > delay imposed by 'make check'.
> > >
> > > Signed-off-by: Phil Sutter <phil@xxxxxx>
> > > ---
> > > Changes since v2:
> > > - Drop RUN_FULL_TESTSUITE env var, it is not needed anymore
> > >
> > > Changes since v1:
> > > - Add an internal configure option set by the distcheck target when
> > > building the project
> > > - Have this configure option define BUILD_DISTCHECK automake variable
> > > - Leave TESTS empty if BUILD_DISTCHECK is set to avoid test suite runs
> > > with 'make distcheck'
> > > ---
> > > Makefile.am | 9 +++++++++
> > > configure.ac | 5 +++++
> > > 2 files changed, 14 insertions(+)
> > >
> > > diff --git a/Makefile.am b/Makefile.am
> > > index 5190a49ae69f1..9112faa2d5c04 100644
> > > --- a/Makefile.am
> > > +++ b/Makefile.am
> > > @@ -23,6 +23,7 @@ libnftables_LIBVERSION = 2:0:1
> > > ###############################################################################
> > >
> > > ACLOCAL_AMFLAGS = -I m4
> > > +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-distcheck
> > >
> > > EXTRA_DIST =
> > > BUILT_SOURCES =
> > > @@ -429,3 +430,11 @@ doc_DATA = files/nftables/main.nft
> > > tools/nftables.service: tools/nftables.service.in ${top_builddir}/config.status
> > > ${AM_V_GEN}${MKDIR_P} tools
> > > ${AM_V_at}sed -e 's|@''sbindir''@|${sbindir}|g;s|@''pkgsysconfdir''@|${pkgsysconfdir}|g' <${srcdir}/tools/nftables.service.in >$@
> > > +
> > > +if !BUILD_DISTCHECK
> > > +TESTS = tests/build/run-tests.sh \
> > > + tests/json_echo/run-test.py \
> > > + tests/monitor/run-tests.sh \
> > > + tests/py/nft-test.py \
> > > + tests/shell/run-tests.sh
> > > +endif
> > > diff --git a/configure.ac b/configure.ac
> > > index da16a6e257c91..8073d4d8193e2 100644
> > > --- a/configure.ac
> > > +++ b/configure.ac
> > > @@ -155,6 +155,11 @@ AC_CONFIG_COMMANDS([nftversion.h], [
> > > AC_SUBST([MAKE_STAMP], ["\$(shell date +%s)"])
> > > CFLAGS="${CFLAGS} -DMAKE_STAMP=\${MAKE_STAMP}"
> > >
> > > +AC_ARG_ENABLE([distcheck],
> > > + AS_HELP_STRING([--enable-distcheck], [Build for distcheck]),
> > > + [enable_distcheck=yes], [])
> > > +AM_CONDITIONAL([BUILD_DISTCHECK], [test "x$enable_distcheck" = "xyes"])
> >
> > Oh no, with distcheck-hook: this is a lot cleaner.
> >
> > Please revert this.
>
> Sorry I misunderstood.
>
> You only applied four patches.
Yes, sorry. I started collecting unrelated fallout again to avoid the
added dependency between two patch series. This is really a bad habit as
it makes reviews harder.
> My apologies.
No need to, thanks for bearing with my mess. I'll check what I can
achieve with distcheck-hook, thanks for the pointer!
Cheers, Phil
