[automake-commit] branch master updated: test: avoid apostrophe in test document.

[Karl Berry]

This is an automated email from the git hooks/post-receive script.

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=ed1368e8803e8934a8bbab52a38753484dba2a37

The following commit(s) were added to refs/heads/master by this push:
     new ed1368e88 test: avoid apostrophe in test document.
ed1368e88 is described below

commit ed1368e8803e8934a8bbab52a38753484dba2a37
Author: Karl Berry <karl@freefriends.org>
AuthorDate: Mon Dec 12 14:50:33 2022 -0800

    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
 }