From: Bruno Haible <bruno@clisp.org>
Date: Sat, 23 Mar 2024 17:10:13 +0000 (+0100)
Subject: gnulib-tool.py: Produce same diagnostics regardless of Automake version.
X-Git-Tag: v1.0~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf13dc68cb1872130f230d732a3d5fb4dcc2b23a;p=thirdparty%2Fgnulib.git

gnulib-tool.py: Produce same diagnostics regardless of Automake version.

* pygnulib/GLTestDir.py (_patch_test_driver): Suppress the diagnostics
from 'patch', and instead provide our own diagnostics.
---

diff --git a/ChangeLog b/ChangeLog
index 22d1684b13..7aff2f21ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-23  Bruno Haible  <bruno@clisp.org>
+
+	gnulib-tool.py: Produce same diagnostics regardless of Automake version.
+	* pygnulib/GLTestDir.py (_patch_test_driver): Suppress the diagnostics
+	from 'patch', and instead provide our own diagnostics.
+
 2024-03-23  Bruno Haible  <bruno@clisp.org>
 
 	gnulib-tool.py: Print "executing touch config.h.in".
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index 5f6fc1a0d9..c1ab923386 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -63,6 +63,7 @@ normpath = os.path.normpath
 def _patch_test_driver() -> None:
     '''Patch the test-driver script in testdirs.'''
     test_driver = joinpath('build-aux', 'test-driver')
+    print('patching file %s' % test_driver)
     diffs = [ joinpath(DIRS['root'], name)
               for name in [joinpath('build-aux', 'test-driver.diff'),
                            joinpath('build-aux', 'test-driver-1.16.3.diff')]]
@@ -70,7 +71,7 @@ def _patch_test_driver() -> None:
     for diff in diffs:
         command = f'patch {test_driver} < {diff}'
         try:
-            result = sp.call(command, shell=True)
+            result = sp.call(command, shell=True, stdout=sp.DEVNULL, stderr=sp.DEVNULL)
         except OSError:
             if isfile(f'{test_driver}.orig'):
                 os.remove(f'{test_driver}.orig')