From: Bruno Haible Date: Mon, 5 Aug 2024 18:24:44 +0000 (+0200) Subject: gnulib-tool.py: Fix testdirs created with --without-tests. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=26aab01aed14514a1371c116e5aa41d7a410ae01;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 7f0942db4d..e2fbd28f72 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 Bruno Haible Fix compilation error in C++ mode with clang >= 16 (regr. 2024-07-29). diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index ecedf992c6..268a14afef 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -619,17 +619,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')