branch master updated: * tp/t/input_files/delcomment_followed_by_cpp_line.texi: remove (wrong) @setfilename.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 0e2cc73b26 * tp/t/input_files/delcomment_followed_by_cpp_line.texi: 
remove (wrong) @setfilename.
0e2cc73b26 is described below

commit 0e2cc73b262cb87d303de93200d0b34f2159ec89
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 16 01:34:19 2023 +0100

    * tp/t/input_files/delcomment_followed_by_cpp_line.texi: remove
    (wrong) @setfilename.
    
    * tp/t/test_utils.pl (output_texi_file): do not add a chapter if there
    is a node with name starting by chap.
---
 ChangeLog                                          |  8 +++
 tp/maintain/check_back_xml_forth_texi_t.sh         |  5 +-
 .../delcomment_followed_by_cpp_line.texi           |  1 -
 .../coverage/delcomment_followed_by_cpp_line.pl    | 61 ++++------------------
 tp/t/test_utils.pl                                 |  9 ++--
 5 files changed, 26 insertions(+), 58 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01f3e5b12a..f9e36abac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-02-15  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/t/input_files/delcomment_followed_by_cpp_line.texi: remove
+       (wrong) @setfilename.
+
+       * tp/t/test_utils.pl (output_texi_file): do not add a chapter if there
+       is a node with name starting by chap.
+
 2023-02-15  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.tres, tp/t/converters_tests.t: add
diff --git a/tp/maintain/check_back_xml_forth_texi_t.sh 
b/tp/maintain/check_back_xml_forth_texi_t.sh
index 6770540480..691e91793a 100755
--- a/tp/maintain/check_back_xml_forth_texi_t.sh
+++ b/tp/maintain/check_back_xml_forth_texi_t.sh
@@ -85,8 +85,9 @@ for dir in `find t_texis/ -type d` ; do
     echo "    -> $file: plaintexinfo"
     # Either the output file or the output directory can be specified.
     # The conversion to Texinfo XML below uses the directory.
-    # Note that the file name obtained with plaintexinfo should match with the
-    # test name otherwise the diff is not possible.
+    # Note that if the file name obtained with plaintexinfo does not match
+    # with test name, there will be a file name mismatch for the diff in
+    # plain_texi.diff.
     # Even with specifying the directory in both cases, the file names may
     # not be exactly the same when there are specific values for @setfilename.
     # This concerns a few files only, and those files are more or less
diff --git a/tp/t/input_files/delcomment_followed_by_cpp_line.texi 
b/tp/t/input_files/delcomment_followed_by_cpp_line.texi
index a5d1ad9549..77f4485d47 100644
--- a/tp/t/input_files/delcomment_followed_by_cpp_line.texi
+++ b/tp/t/input_files/delcomment_followed_by_cpp_line.texi
@@ -1,5 +1,4 @@
 \input texinfo
-@setfilename delcomment.info
 
 @c this tests both the del comment and a file without
 @c element.
diff --git a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl 
b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
index 36a2d9bdc5..c0a46e6ed9 100644
--- a/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
+++ b/tp/t/results/coverage/delcomment_followed_by_cpp_line.pl
@@ -12,57 +12,20 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
         {
           'contents' => [
             {
-              'contents' => [
-                {
-                  'text' => '\\input texinfo
+              'text' => '\\input texinfo
 ',
-                  'type' => 'text_before_beginning'
-                }
-              ],
-              'type' => 'preamble_before_beginning'
+              'type' => 'text_before_beginning'
+            },
+            {
+              'text' => '
+',
+              'type' => 'text_before_beginning'
             }
           ],
-          'type' => 'preamble_before_setfilename'
+          'type' => 'preamble_before_beginning'
         },
         {
           'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'delcomment.info'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
-                    }
-                  },
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'delcomment.info'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'file_name' => 'delcomment_followed_by_cpp_line.texi',
-                'line_nr' => 2,
-                'macro' => ''
-              }
-            },
-            {
-              'text' => '
-',
-              'type' => 'empty_line'
-            },
             {
               'args' => [
                 {
@@ -240,7 +203,6 @@ $result_trees{'delcomment_followed_by_cpp_line'} = {
 };
 
 $result_texis{'delcomment_followed_by_cpp_line'} = '\\input texinfo
-@setfilename delcomment.info
 
 @c this tests both the del comment and a file without
 @c element.
@@ -262,7 +224,6 @@ $result_texis{'delcomment_followed_by_cpp_line'} = '\\input 
texinfo
 
 
 $result_texts{'delcomment_followed_by_cpp_line'} = '
-
 #line 46 "a_file_after_del_comment"
 
 
@@ -282,7 +243,7 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
     'error_line' => 'unknown command `unknown\'
 ',
     'file_name' => 'delcomment_followed_by_cpp_line.texi',
-    'line_nr' => 10,
+    'line_nr' => 9,
     'macro' => '',
     'text' => 'unknown command `unknown\'',
     'type' => 'error'
@@ -291,7 +252,7 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
     'error_line' => 'unknown command `unknown1\'
 ',
     'file_name' => 'delcomment_followed_by_cpp_line.texi',
-    'line_nr' => 15,
+    'line_nr' => 14,
     'macro' => '',
     'text' => 'unknown command `unknown1\'',
     'type' => 'error'
@@ -300,7 +261,7 @@ $result_errors{'delcomment_followed_by_cpp_line'} = [
     'error_line' => 'unknown command `unknown2\'
 ',
     'file_name' => 'delcomment_followed_by_cpp_line.texi',
-    'line_nr' => 20,
+    'line_nr' => 19,
     'macro' => '',
     'text' => 'unknown command `unknown2\'',
     'type' => 'error'
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 3165d710ac..e083effc69 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -1711,14 +1711,13 @@ sub output_texi_file($)
   }
   my $added_chapter = '';
   unless ($test_text =~ /^\@(chapter|unnumbered|appendix)\s/m
-          or $test_text =~ /^\@(chapter|unnumbered|appendix) *$/m) {
-    # need a chapter for LaTeX as Top node is ignored.
+          or $test_text =~ /^\@(chapter|unnumbered|appendix) *$/m
+          or $test_text =~ /^\@node +chap/mi) {
+    # need a chapter or node after Top for LaTeX as Top node is ignored.
     if ($node_top ne '') {
       $added_chapter = "\@node chapter\n\@chapter chapter\n";
     } else {
-      if ($test_text !~ /^\@node +chap/mi) {
-        print STDERR "WARNING: $test_name: there is top, no chapter added\n";
-      }
+      print STDERR "WARNING: $test_name: top in test, no chapter added\n";
     }
   }
   if ($from_file) {