]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: Add support for Automake 1.16.4.
authorBruno Haible <bruno@clisp.org>
Sun, 8 Aug 2021 01:52:01 +0000 (03:52 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 8 Aug 2021 02:00:50 +0000 (04:00 +0200)
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.

ChangeLog
build-aux/test-driver-1.16.3.diff [new file with mode: 0644]
build-aux/test-driver.diff
gnulib-tool

index e6ee239bd631b92bfe92cc2f22e3e3bc0c06ec76..73df01e8b2f847e62675160d37344179da394b92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/build-aux/test-driver-1.16.3.diff b/build-aux/test-driver-1.16.3.diff
new file mode 100644 (file)
index 0000000..b81e5a1
--- /dev/null
@@ -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
index b81e5a1ff837e87585c1d7df38e4b1e278e56ffb..c67106bc41adf3bf591f7f42d8fca309d8a4154a 100644 (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=$?
 
index 63a875d4a26ce98c204c07339681f6890cf79741..9c4a6c17ed996c91a2ea7e56b66d7f2d50282c9d 100755 (executable)
@@ -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
 }