branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/92formatting.t, tp/t/info_tests.t: move direntry_dircategory, split_nocopying and split_nocopying_split to info_tests.t. Use only tests/formatting/split_nocopying.texi and remove t/input_files/split_nocopying.texi.

[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 77d1d21bad * tp/Makefile.am (test_files), tp/Makefile.tres, 
tp/t/92formatting.t, tp/t/info_tests.t: move direntry_dircategory, 
split_nocopying and split_nocopying_split to info_tests.t.  Use only 
tests/formatting/split_nocopying.texi and remove 
t/input_files/split_nocopying.texi.
77d1d21bad is described below

commit 77d1d21bad45ffd416c9b343a9c8b9debaf690a9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 00:27:54 2023 +0100

    * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/92formatting.t,
    tp/t/info_tests.t: move direntry_dircategory, split_nocopying and
    split_nocopying_split to info_tests.t.  Use only
    tests/formatting/split_nocopying.texi and remove
    t/input_files/split_nocopying.texi.
---
 ChangeLog                                            |  8 ++++++++
 tp/Makefile.am                                       |  1 -
 tp/Makefile.tres                                     | 20 ++++++++++----------
 tp/t/92formatting.t                                  | 20 --------------------
 tp/t/info_tests.t                                    | 11 +++++++++++
 tp/t/input_files/split_nocopying.texi                | 17 -----------------
 .../res_info/split_nocopying.info                    | 19 -------------------
 .../res_info/split_nocopying.info-1                  | 15 ---------------
 .../direntry_dircategory.pl                          |  0
 .../res_info/direntry_dircategory.info               | 10 +++++-----
 .../res_info/direntry_dircategory.info-1             |  2 +-
 .../res_info/direntry_dircategory.info-2             |  2 +-
 .../{formatting => info_tests}/split_nocopying.pl    | 14 ++++++++++----
 .../split_nocopying/res_info/split_nocopying.info    | 11 +++++------
 .../split_nocopying_split.pl                         | 14 ++++++++++----
 .../res_info/split_nocopying.info                    | 18 ++++++++++++++++++
 .../res_info/split_nocopying.info-1                  | 14 ++++++++++++++
 .../res_info/split_nocopying.info-2                  |  3 +--
 tp/tests/formatting/split_nocopying.texi             |  3 +--
 19 files changed, 95 insertions(+), 107 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e33f0a49b..96bd2ba961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-02  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/92formatting.t,
+       tp/t/info_tests.t: move direntry_dircategory, split_nocopying and
+       split_nocopying_split to info_tests.t.  Use only
+       tests/formatting/split_nocopying.texi and remove
+       t/input_files/split_nocopying.texi.
+
 2023-01-02  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.tres, tp/t/02coverage.t, tp/t/92formatting.t: move
diff --git a/tp/Makefile.am b/tp/Makefile.am
index ae2d720013..ead589e73c 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -238,7 +238,6 @@ test_files = \
  t/input_files/sample_utf8.texi \
  t/input_files/simplest.texi \
  t/input_files/split_chapter_index.texi \
- t/input_files/split_nocopying.texi \
  t/input_files/simplest_no_node_section.texi \
  t/input_files/special_spaces_in_nodes.texi \
  t/input_files/test_refs.texi \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 3624c5a3ce..84f2281d90 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -558,10 +558,6 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl \
   t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl \
   t/results/formatting/cond_xml.pl \
-  t/results/formatting/direntry_dircategory.pl \
-  t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info 
\
-  
t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-1 \
-  
t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-2 \
   t/results/formatting/float_copying.pl \
   t/results/formatting/float_copying/res_html/Copying-and-floats.html \
   
t/results/formatting/float_copying/res_html/caption-copying-footnote-anchor.html
 \
@@ -578,12 +574,6 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/formatting/simplest_test_prefix_info/res_info/truc.info \
   t/results/formatting/split_for_format_not_split.pl \
   t/results/formatting/split_for_format_not_split/res_xml/simplest.xml \
-  t/results/formatting/split_nocopying.pl \
-  t/results/formatting/split_nocopying/res_info/split_nocopying.info \
-  t/results/formatting/split_nocopying_split.pl \
-  t/results/formatting/split_nocopying_split/res_info/split_nocopying.info \
-  t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-1 \
-  t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-2 \
   t/results/formatting/texi_cond.pl \
   t/results/heading/heading_in_copying.pl \
   t/results/heading/heading_in_example.pl \
@@ -1039,6 +1029,10 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl \
   
t/results/info_tests/colons_in_index_entries_and_node_no_quoting/res_info/colons_in_index_entries_and_node_no_quoting.info
 \
   t/results/info_tests/def_in_copying.pl \
+  t/results/info_tests/direntry_dircategory.pl \
+  t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info 
\
+  
t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-1 \
+  
t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-2 \
   t/results/info_tests/direntry_dircategory_and_commands.pl \
   t/results/info_tests/empty_arguments.pl \
   t/results/info_tests/empty_caption.pl \
@@ -1087,6 +1081,12 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/info_tests/space_in_menu.pl \
   t/results/info_tests/space_in_setfilename.pl \
   t/results/info_tests/split_no_copying.pl \
+  t/results/info_tests/split_nocopying.pl \
+  t/results/info_tests/split_nocopying/res_info/split_nocopying.info \
+  t/results/info_tests/split_nocopying_split.pl \
+  t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info \
+  t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-1 \
+  t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-2 \
   t/results/info_tests/split_test_before_first_node.pl \
   
t/results/info_tests/split_test_before_first_node/res_info/split_test_before_first_node.info
 \
   
t/results/info_tests/split_test_before_first_node/res_info/split_test_before_first_node.info-1
 \
diff --git a/tp/t/92formatting.t b/tp/t/92formatting.t
index fa687c09b1..4cba144dcc 100644
--- a/tp/t/92formatting.t
+++ b/tp/t/92formatting.t
@@ -55,26 +55,6 @@ my @test_cases = (
   },
   {'EXPANDED_FORMATS' => ['info', 'html', 'tex'],}
 ],
-['direntry_dircategory',
-  undef,
-  {'test_file' => 'direntry_dircategory.texi',
-   'test_formats' => ['file_info']
-  },
-  {'SPLIT_SIZE' => 1}
-],
-['split_nocopying',
-  undef,
-  {'test_file' => 'split_nocopying.texi',
-   'test_formats' => ['file_info']
-  },
-],
-['split_nocopying_split',
-  undef,
-  {'test_file' => 'split_nocopying.texi',
-   'test_formats' => ['file_info']
-  },
-  {'SPLIT_SIZE' => 10}
-],
 ['simplest_test_prefix',
   undef,
   {'test_file' => 'simplest.texi',
diff --git a/tp/t/info_tests.t b/tp/t/info_tests.t
index 6217c34c0c..68db18421d 100644
--- a/tp/t/info_tests.t
+++ b/tp/t/info_tests.t
@@ -1031,6 +1031,17 @@ In top node
 In chap1.
 
 ',{},{'SPLIT_SIZE' => 10}],
+['split_nocopying',
+  undef, {'test_file' => '../../tests/formatting/split_nocopying.texi',},
+],
+['split_nocopying_split',
+  undef, {'test_file' => '../../tests/formatting/split_nocopying.texi',},
+  {'SPLIT_SIZE' => 10},
+],
+['direntry_dircategory',
+  undef, {'test_file' => 'direntry_dircategory.texi'},
+  {'SPLIT_SIZE' => 1}
+],
 ['quote_node_names_info',
 undef, {'test_file' => 'nodequote.texi',},
 {'INFO_SPECIAL_CHARS_QUOTE' => 1,
diff --git a/tp/t/input_files/split_nocopying.texi 
b/tp/t/input_files/split_nocopying.texi
deleted file mode 100644
index 3c90a6d2b6..0000000000
--- a/tp/t/input_files/split_nocopying.texi
+++ /dev/null
@@ -1,17 +0,0 @@
-\input texinfo
-
-@node Top
-@top Test file used to test split Info without copying
-
-This is the top node.
-
-@menu
-* Ch1::
-@end menu
-
-@node Ch1
-@chapter Ch1
-
-First chapter.
-
-@bye
diff --git 
a/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info 
b/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info
deleted file mode 100644
index 4fc7c2f84d..0000000000
--- 
a/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info
+++ /dev/null
@@ -1,19 +0,0 @@
-This is split_nocopying.info, produced by texi2any version from
-split_nocopying.texi.
-
-
-Indirect:
-split_nocopying.info-1: 87
-split_nocopying.info-2: 382
-
-Tag Table:
-(Indirect)
-Node: Top87
-Node: Ch1382
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
diff --git 
a/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-1 
b/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-1
deleted file mode 100644
index 5b63afe162..0000000000
--- 
a/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-1
+++ /dev/null
@@ -1,15 +0,0 @@
-This is split_nocopying.info, produced by texi2any version from
-split_nocopying.texi.
-
-
-File: split_nocopying.info,  Node: Top,  Next: Ch1,  Up: (dir)
-
-Test file used to test split Info without copying
-*************************************************
-
-This is the top node.
-
-* Menu:
-
-* Ch1::
-
diff --git a/tp/t/results/formatting/direntry_dircategory.pl 
b/tp/t/results/info_tests/direntry_dircategory.pl
similarity index 100%
rename from tp/t/results/formatting/direntry_dircategory.pl
rename to tp/t/results/info_tests/direntry_dircategory.pl
diff --git 
a/tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info
 
b/tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info
similarity index 73%
rename from 
tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info
rename to 
tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info
index 02c710f25d..a4ab3ea097 100644
--- 
a/tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info
+++ 
b/tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info
@@ -1,4 +1,4 @@
-This is direntry_dircategory.info, produced by texi2any version from
+This is direntry_dircategory.info, produced from
 direntry_dircategory.texi.
 
 INFO-DIR-SECTION “category—TH ERE?”
@@ -21,13 +21,13 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-direntry_dircategory.info-1: 440
-direntry_dircategory.info-2: 1044
+direntry_dircategory.info-1: 420
+direntry_dircategory.info-2: 1004
 
 Tag Table:
 (Indirect)
-Node: Top440
-Node: chapter1044
+Node: Top420
+Node: chapter1004
 
 End Tag Table
 
diff --git 
a/tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-1
 
b/tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-1
similarity index 88%
rename from 
tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-1
rename to 
tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-1
index 43c8879359..dd12bb6cea 100644
--- 
a/tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-1
+++ 
b/tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-1
@@ -1,4 +1,4 @@
-This is direntry_dircategory.info, produced by texi2any version from
+This is direntry_dircategory.info, produced from
 direntry_dircategory.texi.
 
 INFO-DIR-SECTION “category—TH ERE?”
diff --git 
a/tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-2
 
b/tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-2
similarity index 87%
rename from 
tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-2
rename to 
tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-2
index c8e4c4aafb..417aa087d4 100644
--- 
a/tp/t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-2
+++ 
b/tp/t/results/info_tests/direntry_dircategory/res_info/direntry_dircategory.info-2
@@ -1,4 +1,4 @@
-This is direntry_dircategory.info, produced by texi2any version from
+This is direntry_dircategory.info, produced from
 direntry_dircategory.texi.
 
 INFO-DIR-SECTION “category—TH ERE?”
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/info_tests/split_nocopying.pl
similarity index 97%
rename from tp/t/results/formatting/split_nocopying.pl
rename to tp/t/results/info_tests/split_nocopying.pl
index 1872655782..e0bf402445 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/info_tests/split_nocopying.pl
@@ -75,7 +75,13 @@ $result_trees{'split_nocopying'} = {
         {
           'contents' => [
             {
-              'text' => 'Test file used to test split Info without copying'
+              'text' => 'Test file used to test split Info without '
+            },
+            {
+              'cmdname' => '@'
+            },
+            {
+              'text' => 'copying'
             }
           ],
           'info' => {
@@ -327,7 +333,7 @@ 
$result_trees{'split_nocopying'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'no
 $result_texis{'split_nocopying'} = '\\input texinfo
 
 @node Top
-@top Test file used to test split Info without copying
+@top Test file used to test split Info without @@copying
 
 This is the top node.
 
@@ -344,8 +350,8 @@ First chapter.
 ';
 
 
-$result_texts{'split_nocopying'} = 'Test file used to test split Info without 
copying
-*************************************************
+$result_texts{'split_nocopying'} = 'Test file used to test split Info without 
@copying
+**************************************************
 
 This is the top node.
 
diff --git 
a/tp/t/results/formatting/split_nocopying/res_info/split_nocopying.info 
b/tp/t/results/info_tests/split_nocopying/res_info/split_nocopying.info
similarity index 55%
rename from 
tp/t/results/formatting/split_nocopying/res_info/split_nocopying.info
rename to tp/t/results/info_tests/split_nocopying/res_info/split_nocopying.info
index d3490d0c58..5d57c53670 100644
--- a/tp/t/results/formatting/split_nocopying/res_info/split_nocopying.info
+++ b/tp/t/results/info_tests/split_nocopying/res_info/split_nocopying.info
@@ -1,11 +1,10 @@
-This is split_nocopying.info, produced by texi2any version from
-split_nocopying.texi.
+This is split_nocopying.info, produced from split_nocopying.texi.
 
 
 File: split_nocopying.info,  Node: Top,  Next: Ch1,  Up: (dir)
 
-Test file used to test split Info without copying
-*************************************************
+Test file used to test split Info without @copying
+**************************************************
 
 This is the top node.
 
@@ -24,8 +23,8 @@ First chapter.
 
 
 Tag Table:
-Node: Top87
-Node: Ch1295
+Node: Top67
+Node: Ch1277
 
 End Tag Table
 
diff --git a/tp/t/results/formatting/split_nocopying_split.pl 
b/tp/t/results/info_tests/split_nocopying_split.pl
similarity index 97%
rename from tp/t/results/formatting/split_nocopying_split.pl
rename to tp/t/results/info_tests/split_nocopying_split.pl
index 353e4f04ac..3bd7f0455e 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/info_tests/split_nocopying_split.pl
@@ -75,7 +75,13 @@ $result_trees{'split_nocopying_split'} = {
         {
           'contents' => [
             {
-              'text' => 'Test file used to test split Info without copying'
+              'text' => 'Test file used to test split Info without '
+            },
+            {
+              'cmdname' => '@'
+            },
+            {
+              'text' => 'copying'
             }
           ],
           'info' => {
@@ -327,7 +333,7 @@ 
$result_trees{'split_nocopying_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[
 $result_texis{'split_nocopying_split'} = '\\input texinfo
 
 @node Top
-@top Test file used to test split Info without copying
+@top Test file used to test split Info without @@copying
 
 This is the top node.
 
@@ -344,8 +350,8 @@ First chapter.
 ';
 
 
-$result_texts{'split_nocopying_split'} = 'Test file used to test split Info 
without copying
-*************************************************
+$result_texts{'split_nocopying_split'} = 'Test file used to test split Info 
without @copying
+**************************************************
 
 This is the top node.
 
diff --git 
a/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info 
b/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info
new file mode 100644
index 0000000000..425fa07e33
--- /dev/null
+++ 
b/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info
@@ -0,0 +1,18 @@
+This is split_nocopying.info, produced from split_nocopying.texi.
+
+
+Indirect:
+split_nocopying.info-1: 67
+split_nocopying.info-2: 344
+
+Tag Table:
+(Indirect)
+Node: Top67
+Node: Ch1344
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git 
a/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-1 
b/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-1
new file mode 100644
index 0000000000..82b78d905a
--- /dev/null
+++ 
b/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-1
@@ -0,0 +1,14 @@
+This is split_nocopying.info, produced from split_nocopying.texi.
+
+
+File: split_nocopying.info,  Node: Top,  Next: Ch1,  Up: (dir)
+
+Test file used to test split Info without @copying
+**************************************************
+
+This is the top node.
+
+* Menu:
+
+* Ch1::
+
diff --git 
a/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-2 
b/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-2
similarity index 52%
rename from 
tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-2
rename to 
tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-2
index 8dd9ab1baa..b032196bba 100644
--- 
a/tp/t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-2
+++ 
b/tp/t/results/info_tests/split_nocopying_split/res_info/split_nocopying.info-2
@@ -1,5 +1,4 @@
-This is split_nocopying.info, produced by texi2any version from
-split_nocopying.texi.
+This is split_nocopying.info, produced from split_nocopying.texi.
 
 
 File: split_nocopying.info,  Node: Ch1,  Prev: Top,  Up: Top
diff --git a/tp/tests/formatting/split_nocopying.texi 
b/tp/tests/formatting/split_nocopying.texi
index 227a19995c..1c58f2ba3d 100644
--- a/tp/tests/formatting/split_nocopying.texi
+++ b/tp/tests/formatting/split_nocopying.texi
@@ -1,8 +1,7 @@
 \input texinfo
-@setfilename split-nocopying.info
 
 @node Top
-@top Top
+@top Test file used to test split Info without @@copying
 
 This is the top node.