diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-08-08 03:52:01 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-08-08 04:00:50 +0200 |
| commit | 6ccfbd6495f2849b1aeea84f73327f6ced0080a7 (patch) | |
| tree | 32ae90a692811831ff75891eeb984ccab59a7fd0 /build-aux/test-driver.diff | |
| parent | dac3c7e86dfd3d87c5868229aac392d81711d504 (diff) | |
| download | gnulib-6ccfbd6495f2849b1aeea84f73327f6ced0080a7.tar.gz | |
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.
Diffstat (limited to 'build-aux/test-driver.diff')
| -rw-r--r-- | build-aux/test-driver.diff | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build-aux/test-driver.diff b/build-aux/test-driver.diff index b81e5a1ff8..c67106bc41 100644 --- a/build-aux/test-driver.diff +++ b/build-aux/test-driver.diff @@ -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=$? |