From b3dde187b3b453572bc4089a3e83c0d227a45ec4 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Tue, 5 Mar 2024 02:11:51 -0800 Subject: [PATCH 2/2] 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. --- ChangeLog | 7 +++++++ pygnulib/GLImport.py | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 565d61dafa..5031f2f623 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 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 41. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index 0bac4ad18a..3075dc3e47 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) -- 2.44.0