branch master updated: * tp/t/30sectioning.t, tp/Makefile.tres, tp/t/92formatting.t: move split_for_format_not_split to 30sectioning.t. Remove now empty tp/t/92formatting.t.

[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 2e7542c4ea * tp/t/30sectioning.t, tp/Makefile.tres, 
tp/t/92formatting.t: move split_for_format_not_split to 30sectioning.t.  Remove 
now empty tp/t/92formatting.t.
2e7542c4ea is described below

commit 2e7542c4eaa45a654dd592e2d71d2193ae2b0e2c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 11:37:33 2023 +0100

    * tp/t/30sectioning.t, tp/Makefile.tres, tp/t/92formatting.t:
    move split_for_format_not_split to 30sectioning.t.  Remove
    now empty tp/t/92formatting.t.
---
 ChangeLog                                          |  6 +++
 tp/Makefile.tres                                   |  6 +--
 tp/t/30sectioning.t                                | 12 ++++-
 tp/t/92formatting.t                                | 22 --------
 tp/t/results/coverage/minimal_only_input_line.pl   | 62 ++++++++++++++++++++++
 .../split_for_format_not_split.pl                  |  0
 .../res_xml/simplest.xml                           |  0
 7 files changed, 81 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8b68b2744..6d0256f0dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-02  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/t/30sectioning.t, tp/Makefile.tres, tp/t/92formatting.t:
+       move split_for_format_not_split to 30sectioning.t.  Remove
+       now empty tp/t/92formatting.t.
+
 2023-01-02  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/92formatting.t, tp/Makefile.tres, tp/t/55conditionals.t:
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index c250fd19de..12ef251c50 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -28,7 +28,6 @@ test_tap_files_generated_list = \
   t/60macro.t \
   t/70value_and_macro.t \
   t/80include.t \
-  t/92formatting.t \
   t/93layout.t \
   t/94htmlxref.t \
   t/accents.t \
@@ -310,6 +309,7 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/coverage/item_container.pl \
   t/results/coverage/lettered_accent_and_spaces.pl \
   t/results/coverage/math.pl \
+  t/results/coverage/minimal_only_input_line.pl \
   t/results/coverage/multitable.pl \
   t/results/coverage/nested_block_commands.pl \
   t/results/coverage/not_i_j_in_dotless.pl \
@@ -565,8 +565,6 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/formats_encodings/sample_utf8/res_info/sample_utf8.info \
   t/results/formats_encodings/weird_accents.pl \
   t/results/formats_encodings/weird_accents_disable_encoding.pl \
-  t/results/formatting/split_for_format_not_split.pl \
-  t/results/formatting/split_for_format_not_split/res_xml/simplest.xml \
   t/results/heading/heading_in_copying.pl \
   t/results/heading/heading_in_example.pl \
   t/results/heading/heading_in_quotation.pl \
@@ -1978,6 +1976,8 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/sectioning/shortcontents.pl \
   t/results/sectioning/space_in_node.pl \
   t/results/sectioning/special_spaces_in_nodes.pl \
+  t/results/sectioning/split_for_format_not_split.pl \
+  t/results/sectioning/split_for_format_not_split/res_xml/simplest.xml \
   t/results/sectioning/top_chapter_sections.pl \
   t/results/sectioning/top_no_argument_and_content.pl \
   t/results/sectioning/top_no_argument_and_node.pl \
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index 3bb154e7bf..d321f92ab7 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -2182,13 +2182,21 @@ $character_and_spaces_in_refs_text,
 ['topic_guide',
   undef,
   {'test_file' => 'topic_guide.texi',
-   'test_formats' => ['file_info'],}, # file_html is also added
+   'test_formats' => ['file_info', 'file_html'],},
   {'FORMAT_MENU' => 'menu', } # add explicitely for the converter
 ],
+['split_for_format_not_split',
+  undef,
+  {'test_file' => 'simplest.texi',
+   'test_formats' => ['file_xml']
+  },
+  {'SPLIT' => 'chapter'}
+],
 );
 
 foreach my $test (@test_out_files) {
-  push @{$test->[2]->{'test_formats'}}, 'file_html';
+  push @{$test->[2]->{'test_formats'}}, 'file_html'
+    if (!$test->[2]->{'test_formats'});
   $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
 }
 
diff --git a/tp/t/92formatting.t b/tp/t/92formatting.t
deleted file mode 100644
index 47ae5f526d..0000000000
--- a/tp/t/92formatting.t
+++ /dev/null
@@ -1,22 +0,0 @@
-use strict;
-
-use lib '.';
-use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
-
-require 't/test_utils.pl';
-
-# These tests are supposed to test the same things as tests
-# under tp/tests did, but to be faster, as we are avoiding the
-# start-up time of perl for every one.
-my @test_cases = (
-['split_for_format_not_split',
-  undef,
-  {'test_file' => 'simplest.texi',
-   'test_formats' => ['file_xml']
-  },
-  {'SPLIT' => 'chapter'}
-],
-
-);
-
-run_all('formatting', [@test_cases]);
diff --git a/tp/t/results/coverage/minimal_only_input_line.pl 
b/tp/t/results/coverage/minimal_only_input_line.pl
new file mode 100644
index 0000000000..06baf6c965
--- /dev/null
+++ b/tp/t/results/coverage/minimal_only_input_line.pl
@@ -0,0 +1,62 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'minimal_only_input_line'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo.tex
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    }
+  ],
+  'type' => 'document_root'
+};
+
+$result_texis{'minimal_only_input_line'} = '\\input texinfo.tex
+';
+
+
+$result_texts{'minimal_only_input_line'} = '';
+
+$result_errors{'minimal_only_input_line'} = [];
+
+
+$result_floats{'minimal_only_input_line'} = {};
+
+
+
+$result_converted{'plaintext'}->{'minimal_only_input_line'} = '';
+
+
+$result_converted{'html_text'}->{'minimal_only_input_line'} = '';
+
+
+$result_converted{'xml'}->{'minimal_only_input_line'} = 
'<preamblebeforebeginning>\\input texinfo.tex
+</preamblebeforebeginning>';
+
+
+$result_converted{'latex_text'}->{'minimal_only_input_line'} = 
'\\begin{document}
+';
+
+
+$result_converted{'docbook'}->{'minimal_only_input_line'} = '';
+
+1;
diff --git a/tp/t/results/formatting/split_for_format_not_split.pl 
b/tp/t/results/sectioning/split_for_format_not_split.pl
similarity index 100%
rename from tp/t/results/formatting/split_for_format_not_split.pl
rename to tp/t/results/sectioning/split_for_format_not_split.pl
diff --git 
a/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml 
b/tp/t/results/sectioning/split_for_format_not_split/res_xml/simplest.xml
similarity index 100%
rename from 
tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
rename to 
tp/t/results/sectioning/split_for_format_not_split/res_xml/simplest.xml