]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.py: Fix incorrect tests Makefile.am generation.
authorCollin Funk <collin.funk1@gmail.com>
Tue, 5 Mar 2024 10:11:51 +0000 (02:11 -0800)
committerBruno Haible <bruno@clisp.org>
Tue, 5 Mar 2024 23:02:47 +0000 (00:02 +0100)
* 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
pygnulib/GLImport.py

index d72c08840def5e7f2beff73771b3575805f1ff6b..050bc7a50ac15ac4b9a33ea81962a2c38749abc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-03-05  Collin Funk  <collin.funk1@gmail.com>
+
+       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  <bruno@clisp.org>
 
        doc: Update info about fopencookie.
index 9cf9a96e301e0862070a2c93b268a73e25f553f1..2f6e06a8bb0a9edd8516ad70ae251732bd35b458 100644 (file)
@@ -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)