'gnulib-tool --create-testdir' creates a file build-aux/test-driver.orig,
that is not needed and that creates trouble when one adds the generated
testdir in git (because *.orig is typically listed in .gitignore).
This patch removes that useless file.
2025-05-26 Bruno Haible <br...@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.
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')
#===============================================================================
