From b8ffb44d032f7a6ec66a0143ac3119836b38995e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 5 Aug 2024 20:24:44 +0200 Subject: [PATCH] gnulib-tool.py: Fix testdirs created with --without-tests. * pygnulib/GLTestDir.py (GLTestDir.execute): Don't assume that 'gltests' is the last subdirectory with a configure.ac. --- ChangeLog | 6 ++++++ pygnulib/GLTestDir.py | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a03eec348..ed90d1229d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-08-05 Bruno Haible + + gnulib-tool.py: Fix testdirs created with --without-tests. + * pygnulib/GLTestDir.py (GLTestDir.execute): Don't assume that 'gltests' + is the last subdirectory with a configure.ac. + 2024-08-05 Bernhard Voelker dfa-tests: Detect test-dfa-match-aux error. diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index ad4549f734..648d157ad3 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -618,17 +618,13 @@ class GLTestDir: emit += self.emitter.initmacro_done('%stests' % macro_prefix, testsbase) emit += '\ngl_INIT\n\n' if subdirs_with_configure_ac: - if single_configure: - emit += 'AC_CONFIG_SUBDIRS([%s])\n' % ' '.join(subdirs_with_configure_ac[:-1]) - else: # if not single_configure - emit += 'AC_CONFIG_SUBDIRS([%s])\n' % ' '.join(subdirs_with_configure_ac) + emit += 'AC_CONFIG_SUBDIRS([%s])\n' % ' '.join(subdirs_with_configure_ac) makefiles = ['Makefile'] for directory in subdirs: # For subdirs that have a configure.ac by their own, it's the subdir's # configure.ac which creates the subdir's Makefile.am, not this one. - makefiles.append(joinpath(directory, 'Makefile')) - if not single_configure: - makefiles = makefiles[:-1] + if not directory in subdirs_with_configure_ac: + makefiles.append(joinpath(directory, 'Makefile')) emit += 'AC_CONFIG_FILES([%s])\n' % ' '.join(makefiles) emit += 'AC_OUTPUT\n' path = joinpath(self.testdir, 'configure.ac') -- 2.39.5