[no subject]

[Patrice Dumas]

branch: master
commit da431657f81d47c63e04f1f644dd3d8e79d7cc29
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 27 11:08:43 2022 +0100

    * t/html_tests.t: fix incorrect braces nesting.
    
    * t/test_utils.pl: with -c do not add @bye even if it is not at
    the beginning of the line and if followed by @.
---
 ChangeLog          | 7 +++++++
 tp/t/html_tests.t  | 2 +-
 tp/t/test_utils.pl | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42d964b56d..0aa25f591b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-12-27  Patrice Dumas  <pertusus@free.fr>
+
+       * t/html_tests.t: fix incorrect braces nesting.
+
+       * t/test_utils.pl: with -c do not add @bye even if it is not at
+       the beginning of the line and if followed by @.
+
 2022-12-26  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Structuring.pm (sort_indices): when splitting at letters,
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 2628e2dd24..b002d9044c 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -650,7 +650,7 @@ undef, {'test_file' => 
'punctuation_small_case_accents_latin1.texi',
 undef, {'test_file' => 'punctuation_small_case_accents_us_ascii.texi'}],
 ['test_accents_sc_enable_encoding_usascii',
 undef, {'test_file' => 'punctuation_small_case_accents_us_ascii.texi',
-        'ENABLE_ENCODING' => 1, {'OUTPUT_CHARACTERS' => 1}}],
+        'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' => 1}],
 ['test_accents_sc_use_numeric_entity',
 undef, {'test_file' => 'punctuation_small_case_accents_utf8.texi'},
        {'USE_NUMERIC_ENTITY' => 1}],
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 09dc6bbabf..e0876374ab 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -1669,7 +1669,8 @@ sub output_texi_file($)
     $added_chapter = "\@node chapter\n\@chapter chapter\n";
   }
   my $bye = '';
-  if ($test_text !~ /^\@bye *$/m) {
+  if ($test_text !~ /\@bye *$/m
+      and $test_text !~ /\@bye[\@ ]/) {
     $bye = '@bye';
   }
   foreach my $output ($first_line, $node_top, $added_chapter) {