upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-04-28 06:33:36 +00:00
Code Activity

gnulib-tool: Add support for Automake 1.16.4.

Browse Source 
Reported by <shoober420@gmail.com> in
<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00000.html>.

* build-aux/test-driver-1.16.3.diff: Renamed from build-aux/test-driver.diff.
* build-aux/test-driver.diff: Update to match Automake 1.16.4.
* gnulib-tool (func_create_testdir, func_create_megatestdir): Try both
.diff files.
This commit is contained in:
Bruno Haible
2021-08-08 03:52:01 +02:00
parent dac3c7e86d
commit 6ccfbd6495
4 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
2021-08-07 Bruno Haible <bruno@clisp.org>
gnulib-tool: Add support for Automake 1.16.4.
Reported by <shoober420@gmail.com> in
<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00000.html>.
* build-aux/test-driver-1.16.3.diff: Renamed from
build-aux/test-driver.diff.
* build-aux/test-driver.diff: Update to match Automake 1.16.4.
* gnulib-tool (func_create_testdir, func_create_megatestdir): Try both
.diff files.
2021-08-07 Bruno Haible <bruno@clisp.org>
gnulib-common.m4: Minor style fix.

14
build-aux/test-driver-1.16.3.diff Normal file
View File

@@ -0,0 +1,14 @@
--- test-driver.bak 2019-01-23 03:22:06.672283432 +0100
+++ test-driver 2019-01-23 04:23:21.201060757 +0100
@@ -106,7 +106,10 @@
trap "st=143; $do_exit" 15
# Test script is run here.
-"$@" >$log_file 2>&1
+case "$1" in
+ *.sh) sh "$@" >$log_file 2>&1 ;;
+ *) "$@" >$log_file 2>&1 ;;
+esac
estatus=$?
if test $enable_hard_errors = no && test $estatus -eq 99; then

18
build-aux/test-driver.diff
View File

@@ -1,13 +1,13 @@
--- test-driver.bak 2019-01-23 03:22:06.672283432 +0100
+++ test-driver 2019-01-23 04:23:21.201060757 +0100
@@ -106,7 +106,10 @@
trap "st=143; $do_exit" 15
# Test script is run here.
-"$@" >$log_file 2>&1
--- test-driver.bak 2021-08-04 11:12:04.399976745 +0200
+++ test-driver 2021-08-04 11:17:17.646343985 +0200
@@ -109,7 +109,10 @@
# to ameliorate tests themselves also writing to the log file. Our tests
# don't, but others can (automake bug#35762).
: >"$log_file"
-"$@" >>"$log_file" 2>&1
+case "$1" in
+ *.sh) sh "$@" >$log_file 2>&1 ;;
+ *) "$@" >$log_file 2>&1 ;;
+ *.sh) sh "$@" >>"$log_file" 2>&1 ;;
+ *) "$@" >>"$log_file" 2>&1 ;;
+esac
estatus=$?

8
gnulib-tool
View File

@@ -6767,7 +6767,9 @@ 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 || func_exit 1
patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff \
|| patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff \
|| func_exit 1
fi
) || func_exit 1
}
@@ -6871,7 +6873,9 @@ 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 || func_exit 1
patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff \
|| patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver-1.16.3.diff \
|| func_exit 1
fi
) || func_exit 1
}