gnulib-tool: Remove build-aux/test-driver.orig from testdirs.

* gnulib-tool.sh (func_create_testdir): Remove file
build-aux/test-driver.orig at the end.
* pygnulib/GLTestDir.py (_patch_test_driver): Likewise.

diff --git a/ChangeLog b/ChangeLog
index bf5b7826403db30a464a2e442b7cb27542576a3c..9e566bb5c37bc0774de35f4bd6b1723556639d5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-05-26  Bruno Haible  <bruno@clisp.org>
+
+       gnulib-tool: Remove build-aux/test-driver.orig from testdirs.
+       * gnulib-tool.sh (func_create_testdir): Remove file
+       build-aux/test-driver.orig at the end.
+       * pygnulib/GLTestDir.py (_patch_test_driver): Likewise.
+
 2025-05-25  Bruno Haible  <bruno@clisp.org>
 
        stddef-h tests: Add more C++ tests.

diff --git a/gnulib-tool.sh b/gnulib-tool.sh
index e377f9ea78f863b3598de6bfe987722e8b6c164e..040bfb4eb012346bca57310f4f357a9f0a582586 100755 (executable)
--- a/gnulib-tool.sh
+++ b/gnulib-tool.sh
@@ -7177,6 +7177,7 @@ func_create_testdir ()
                  func_fatal_error "could not patch test-driver script"
                }
           }
+     rm -f build-aux/test-driver.orig
    fi
   ) || func_exit 1
 }

diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index bef156388929acc2a91f302955644c1fc5e91ecb..50b54aae07c790977183201b62be76974b6ab80a 100644 (file)
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -81,6 +81,8 @@ def _patch_test_driver() -> None:
             os.remove(f'{test_driver}.rej')
     if not patched:
         raise GLError(20, None)
+    if os.path.isfile(f'{test_driver}.orig'):
+        os.remove(f'{test_driver}.orig')
 
 
 #===============================================================================