Fix test failure due to texinfo 7.x update

Texinfo harmonized handling of quotes in version 7.0, which leads to a
test failure, which grep for the wrong type of quotes.
Upstream decided to modify the string, so that quotes don't change the
result of the test anymore.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Frédéric Bérat 2023-01-20 13:19:26 +01:00
parent 8a5cad337b
commit a517ed0aba
2 changed files with 58 additions and 1 deletions

View File

@ -0,0 +1,51 @@
From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 12 Dec 2022 14:50:33 -0800
Subject: [PATCH] test: avoid apostrophe in test document.
From automake patch https://bugs.gnu.org/59989
(though a different solution), suggestion by Frederic Berat.
* t/txinfo-include.sh: avoid apostrophes in test document,
since Texinfo 7.0 turns them into UTF-8 by default.
---
t/txinfo-include.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
index 8a15f01b0..10fff0753 100644
--- a/t/txinfo-include.sh
+++ b/t/txinfo-include.sh
@@ -28,6 +28,9 @@ main_TEXINFOS = one.texi two.texi three.texi
sub_more_TEXINFOS = sub/desc.texi sub/hist.texi
END
+# We avoid apostrophes in the test document since Texinfo
+# turns them into UTF-8, which is not easy to grep.
+#
cat > main.texi << 'END'
\input texinfo
@setfilename main.info
@@ -61,8 +64,8 @@ END
cat > three.texi << 'END'
@node three
-@chapter Chapter two
-GNU's Not Unix.
+@chapter Chapter three
+Quux quux quux.
END
mkdir sub
@@ -106,7 +109,7 @@ check_info_contents ()
srcdir=${1-.}
$FGREP "Foo bar, baz." $srcdir/main.info
$FGREP "Blah Blah Blah." $srcdir/main.info
- $FGREP "GNU's Not Unix." $srcdir/main.info
+ $FGREP "Quux quux quux." $srcdir/main.info
$FGREP 'It does something, really.' $srcdir/sub/more.info
$FGREP 'It was written somehow.' $srcdir/sub/more.info
}
--
2.39.0

View File

@ -23,7 +23,7 @@ Summary: A GNU tool for automatically creating Makefiles
Name: automake Name: automake
# Any bump here requires libtool rebuild, rhbz#1813010 # Any bump here requires libtool rebuild, rhbz#1813010
Version: %{api_version}.5 Version: %{api_version}.5
Release: 10%{?dist} Release: 11%{?dist}
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
License: GPLv2+ and GFDL and Public Domain and MIT License: GPLv2+ and GFDL and Public Domain and MIT
@ -36,6 +36,9 @@ Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
# being inserted in build logs, breaking the original grep instruction # being inserted in build logs, breaking the original grep instruction
Patch0: fort2.patch Patch0: fort2.patch
# From upstream: ed1368e8803e8934a8bbab52a38753484dba2a37
Patch1: 0001-test-avoid-apostrophe-in-test-document.patch
URL: http://www.gnu.org/software/automake/ URL: http://www.gnu.org/software/automake/
Requires: autoconf >= 2.65 Requires: autoconf >= 2.65
@ -138,6 +141,9 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
%changelog %changelog
* Fri Jan 20 2023 Frederic Berat <fberat@redhat.com> - 1.16.5-11
- Fix test failure due to texinfo 7.0 update
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-10 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild