With Automake 1.16.3 in $PATH, "gnulib-tool --create-testdir ..." produces more diagnostics than with Automake 1.16.5 in $PATH. It is better if the diagnostics are the same: better for the user, but also for the test suite.
This patch does it. 2024-03-22 Bruno Haible <[email protected]> gnulib-tool.sh: Produce same diagnostics regardless of Automake version. * gnulib-tool.sh (func_create_testdir, func_create_megatestdir): Suppress the diagnostics from 'patch', and instead provide our own diagnostics. diff --git a/gnulib-tool.sh b/gnulib-tool.sh index da879cb01a..d3b1cc710d 100755 --- a/gnulib-tool.sh +++ b/gnulib-tool.sh @@ -7071,11 +7071,12 @@ func_create_testdir () fi (cd "$testdir" if test -f build-aux/test-driver; then - patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff \ + echo "patching file build-aux/test-driver" + patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff >/dev/null 2>&1 \ || { rm -f build-aux/test-driver.orig build-aux/test-driver.rej - patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff \ + patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff >/dev/null 2>&1 \ || { rm -f build-aux/test-driver.orig build-aux/test-driver.rej - func_exit 1 + func_fatal_error "could not patch test-driver script" } } fi @@ -7182,11 +7183,12 @@ func_create_megatestdir () func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 rm -rf autom4te.cache if test -f build-aux/test-driver; then - patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff \ + echo "patching file build-aux/test-driver" + patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff >/dev/null 2>&1 \ || { rm -f build-aux/test-driver.orig build-aux/test-driver.rej - patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff \ + patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff >/dev/null 2>&1 \ || { rm -f build-aux/test-driver.orig build-aux/test-driver.rej - func_exit 1 + func_fatal_error "could not patch test-driver script" } } fi
