4 days ago I wrote: > * modules/test-framework-sh (Makefile.am): Augment TESTS_ENVIRONMENT > here.
Now, this breaks a testdir of all modules: $ ./gnulib-tool --create-testdir --dir=./testdir --single-configure --with-c++-tests --without-privileged-test ... gllib/Makefile.am:11158: error: TESTS_ENVIRONMENT must be set with '=' before using '+=' That's because test-framework-sh is also used in gllib/, not only in gltests/. This patch fixes it. 2025-08-09 Bruno Haible <[email protected]> gnulib-tool: Fix invalid generated Makefile.am (regression 2025-08-04). * gnulib-tool.sh (func_emit_lib_Makefile_am): Emit line that initializes TESTS_ENVIRONMENT. * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am): Likewise. diff --git a/gnulib-tool.sh b/gnulib-tool.sh index e0a8cbba82..96e2f39b4a 100755 --- a/gnulib-tool.sh +++ b/gnulib-tool.sh @@ -3943,6 +3943,7 @@ func_emit_lib_Makefile_am () echo if test -z "$makefile_name"; then echo "SUBDIRS =" + echo "TESTS_ENVIRONMENT =" echo "noinst_HEADERS =" echo "noinst_LIBRARIES =" echo "noinst_LTLIBRARIES =" diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index cf16dd8654..efa95244fe 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -825,6 +825,7 @@ def lib_Makefile_am(self, destfile: str, modules: list[GLModule], moduletable: G emit += '\n' if not makefile_name: emit += 'SUBDIRS =\n' + emit += 'TESTS_ENVIRONMENT =\n' emit += 'noinst_HEADERS =\n' emit += 'noinst_LIBRARIES =\n' emit += 'noinst_LTLIBRARIES =\n'
