From: Collin Funk <collin.funk1@gmail.com>
Date: Fri, 22 Mar 2024 19:19:28 +0000 (-0700)
Subject: gnulib-tool.py: Fix empty newline output in test directories.
X-Git-Tag: v1.0~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53c447b2ace8ff48d34ef0388bc774c54d692586;p=thirdparty%2Fgnulib.git

gnulib-tool.py: Fix empty newline output in test directories.

* pygnulib/GLTestDir.py (GLTestDir.execute, GLMegaTestDir.execute):
Match newlines printed by gnulib-tool.sh.
---

diff --git a/ChangeLog b/ChangeLog
index 38633a82e9..183a1e1996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-22  Collin Funk  <collin.funk1@gmail.com>
+
+	gnulib-tool.py: Fix empty newline output in test directories.
+	* pygnulib/GLTestDir.py (GLTestDir.execute, GLMegaTestDir.execute):
+	Match newlines printed by gnulib-tool.sh.
+
 2024-03-22  Collin Funk  <collin.funk1@gmail.com>
 
 	gnulib-tool.py: Fix unconditional Automake snippets for non-tests.
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index ea16d808a3..6f6a75931a 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -580,6 +580,7 @@ class GLTestDir(object):
         emit += self.emitter.preEarlyMacros(False, '', modules)
         if any_uses_subdirs:
             emit += 'AM_PROG_CC_C_O\n'
+            emit += '\n'
         snippets = list()
         for module in final_modules:
             if single_configure:
@@ -1018,7 +1019,7 @@ class GLMegaTestDir(object):
 
         emit = '# Process this file with autoconf '
         emit += 'to produce a configure script.\n'
-        emit += 'AC_INIT([dummy], [0])\n\n'
+        emit += 'AC_INIT([dummy], [0])\n'
         if auxdir != '.':
             emit += 'AC_CONFIG_AUX_DIR([%s])\n' % auxdir
         emit += 'AM_INIT_AUTOMAKE\n\n'