From: Bruno Haible <bruno@clisp.org>
Date: Mon, 26 May 2025 08:25:10 +0000 (+0200)
Subject: gnulib-tool: Remove build-aux/test-driver.orig from testdirs.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f629af8d1ea796361fee16d66fa6d3f41525a41;p=thirdparty%2Fgnulib.git

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 bf5b782640..9e566bb5c3 100644
--- 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 e377f9ea78..040bfb4eb0 100755
--- 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 bef1563889..50b54aae07 100644
--- 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')
 
 
 #===============================================================================