From: Collin Funk Date: Tue, 5 Mar 2024 10:11:51 +0000 (-0800) Subject: gnulib-tool.py: Fix incorrect tests Makefile.am generation. X-Git-Tag: v1.0~331 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=79207d3a152111c9a958b10096813783a2124d8b;p=gnulib.git gnulib-tool.py: Fix incorrect tests Makefile.am generation. * pygnulib/GLImport.py: Call GLEmiter.tests_Makefile_am instead of GLEmiter.lib_Makefile_am when creating the tests Makefile. Replace incorrect actioncmd argument with witness_macro. --- diff --git a/ChangeLog b/ChangeLog index d72c08840d..050bc7a50a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-03-05 Collin Funk + + gnulib-tool.py: Fix incorrect tests Makefile.am generation. + * pygnulib/GLImport.py: Call GLEmiter.tests_Makefile_am instead of + GLEmiter.lib_Makefile_am when creating the tests Makefile. Replace + incorrect actioncmd argument with witness_macro. + 2024-03-05 Bruno Haible doc: Update info about fopencookie. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index 9cf9a96e30..2f6e06a8bb 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -1279,9 +1279,9 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix if inctests: basename = joinpath(testsbase, makefile_am) tmpfile = self.assistant.tmpfilename(basename) - emit, uses_subdirs = self.emitter.lib_Makefile_am(basename, - self.moduletable['tests'], self.moduletable, self.makefiletable, - actioncmd, for_test) + emit, uses_subdirs = self.emitter.tests_Makefile_am(basename, + self.moduletable['tests'], self.moduletable, self.makefiletable, + '%stests_WITNESS' % macro_prefix, for_test) with codecs.open(tmpfile, 'wb', 'UTF-8') as file: file.write(emit) filename, backup, flag = self.assistant.super_update(basename, tmpfile)