automake/0001-test-avoid-apostrophe-in-test-document.patch
Frédéric Bérat a517ed0aba 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>
2023-01-30 14:39:50 +01:00

52 lines
1.6 KiB
Diff

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