]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.py: Fix testdirs created with --without-tests.
authorBruno Haible <bruno@clisp.org>
Mon, 5 Aug 2024 18:24:44 +0000 (20:24 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 12 Aug 2024 16:14:25 +0000 (18:14 +0200)
* pygnulib/GLTestDir.py (GLTestDir.execute): Don't assume that 'gltests'
is the last subdirectory with a configure.ac.

ChangeLog
pygnulib/GLTestDir.py

index 6a03eec348f08f72ff0a50d8856dd3ddffea2283..ed90d1229d058afda7ae20f61be68ea844106b64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-08-05  Bruno Haible  <bruno@clisp.org>
+
+       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  <mail@bernhard-voelker.de>
 
        dfa-tests: Detect test-dfa-match-aux error.
index ad4549f734800fcbf08551a9ad0e287cd2a8ea40..648d157ad3e448c3e41ff79e49aa5f5828728323 100644 (file)
@@ -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')