[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40m
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40moresectioning.t: move some tests from tp/t/30sectioning.t to tp/t/40moresectioning.t. |
|
Date: |
Tue, 03 Jan 2023 14:25:56 -0500 |
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 b68ace440e * tp/Makefile.tres, tp/t/30sectioning.t,
tp/t/40moresectioning.t: move some tests from tp/t/30sectioning.t to
tp/t/40moresectioning.t.
b68ace440e is described below
commit b68ace440e117c29d48115719b98a3ab79cae811
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 20:25:46 2023 +0100
* tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40moresectioning.t:
move some tests from tp/t/30sectioning.t to tp/t/40moresectioning.t.
---
tp/Makefile.tres | 20 +-
tp/t/30sectioning.t | 227 ---------------------
tp/t/40moresectioning.t | 227 +++++++++++++++++++++
.../empty_top_node_up.pl | 0
.../internal_top_node_up.pl | 0
.../more_sections_than_nodes.pl | 0
.../{sectioning => moresectioning}/no_element.pl | 0
.../non_automatic_internal_top_node_up.pl | 0
.../non_automatic_top_node_up_and_url.pl | 0
.../non_automatic_top_node_up_url.pl | 0
.../placed_things_before_element.pl | 0
.../placed_things_before_node.pl | 0
.../top_node_up_url.pl | 0
13 files changed, 237 insertions(+), 237 deletions(-)
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 8027f3ee5f..6e45f2d31b 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1598,8 +1598,17 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/moresectioning/character_and_spaces_in_refs.pl \
t/results/moresectioning/contents.pl \
t/results/moresectioning/contents_and_shortcontents.pl \
+ t/results/moresectioning/empty_top_node_up.pl \
t/results/moresectioning/equivalent_nodes_defined_linked.pl \
+ t/results/moresectioning/internal_top_node_up.pl \
+ t/results/moresectioning/more_sections_than_nodes.pl \
+ t/results/moresectioning/no_element.pl \
+ t/results/moresectioning/non_automatic_internal_top_node_up.pl \
+ t/results/moresectioning/non_automatic_top_node_up_and_url.pl \
+ t/results/moresectioning/non_automatic_top_node_up_url.pl \
t/results/moresectioning/only_special_spaces_node.pl \
+ t/results/moresectioning/placed_things_before_element.pl \
+ t/results/moresectioning/placed_things_before_node.pl \
t/results/moresectioning/section_in_unnumbered_info.pl \
t/results/moresectioning/section_in_unnumbered_plaintext.pl \
t/results/moresectioning/sectioning_part_appendix.pl \
@@ -1610,6 +1619,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/moresectioning/shortcontents.pl \
t/results/moresectioning/special_spaces_in_nodes.pl \
t/results/moresectioning/top_chapter_sections.pl \
+ t/results/moresectioning/top_node_up_url.pl \
t/results/multitable/empty_headitem.pl \
t/results/multitable/empty_item_tab.pl \
t/results/multitable/empty_multitable_with_cells.pl \
@@ -1866,7 +1876,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/empty_nodes_with_commands.pl \
t/results/sectioning/empty_ref_arg.pl \
t/results/sectioning/empty_refs.pl \
- t/results/sectioning/empty_top_node_up.pl \
t/results/sectioning/equivalent_labels.pl \
t/results/sectioning/equivalent_nodes.pl \
t/results/sectioning/explicit_node_directions.pl \
@@ -1876,7 +1885,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl \
t/results/sectioning/in_menu_only_special_spaces_node.pl \
t/results/sectioning/in_menu_only_special_spaces_node_menu.pl \
- t/results/sectioning/internal_top_node_up.pl \
t/results/sectioning/lone_Top_node.pl \
t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex \
t/results/sectioning/lone_contents.pl \
@@ -1885,11 +1893,9 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/lowered_subsubsection.pl \
t/results/sectioning/loweredheading.pl \
t/results/sectioning/menutextorder.pl \
- t/results/sectioning/more_sections_than_nodes.pl \
t/results/sectioning/next_in_menu_is_below.pl \
t/results/sectioning/next_no_prev_to_node.pl \
t/results/sectioning/no_argument_and_contents.pl \
- t/results/sectioning/no_element.pl \
t/results/sectioning/no_menu.pl \
t/results/sectioning/node.pl \
t/results/sectioning/node_empty_direction.pl \
@@ -1937,9 +1943,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/nodes_before_top.pl \
t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex \
t/results/sectioning/nodes_no_node_top_explicit_directions.pl \
- t/results/sectioning/non_automatic_internal_top_node_up.pl \
- t/results/sectioning/non_automatic_top_node_up_and_url.pl \
- t/results/sectioning/non_automatic_top_node_up_url.pl \
t/results/sectioning/novalidate.pl \
t/results/sectioning/one_node_explicit_directions_anchor.pl \
t/results/sectioning/one_subsection.pl \
@@ -1957,8 +1960,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/part_node_node_part_appendix.pl \
t/results/sectioning/part_node_part_appendix.pl \
t/results/sectioning/part_node_part_node_appendix.pl \
- t/results/sectioning/placed_things_before_element.pl \
- t/results/sectioning/placed_things_before_node.pl \
t/results/sectioning/protected_node_parentheses.pl \
t/results/sectioning/raiselowersections.pl \
t/results/sectioning/rec_nodes.pl \
@@ -1992,7 +1993,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/top_node_no_menu_direction.pl \
t/results/sectioning/top_node_part_top.pl \
t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex \
- t/results/sectioning/top_node_up_url.pl \
t/results/sectioning/top_part_chapter.pl \
t/results/sectioning/top_without_node_nodes.pl \
t/results/sectioning/top_without_node_sections.pl \
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index d8a15bdc5f..120a11d571 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -407,117 +407,6 @@ In float
@xref{node}.
'],
-['no_element',
-'@settitle no_element test
-@documentencoding ISO-8859-1
-
-
-@anchor{An anchor}
-
-Ref to the anchor:
-@ref{An anchor}
-
-Ref to the anchor in footnote:
-@ref{Anchor in footnote}.
-
-@footnote{In footnote.
-
-@anchor{Anchor in footnote}
-
-Ref to main text anchor
-@ref{An anchor}
-}
-
-@float , float anchor
-In float
-@end float
-
-Ref to float
-@ref{float anchor}.
-
-@menu
-* An anchor:: menu entry pointing to the anchor.
-@end menu
-
-@cindex index entry
-', {}, {'SHOW_TITLE' => 1}],
-['placed_things_before_element',
-'@anchor{An anchor}
-
-Ref to the anchor:
-@ref{An anchor}
-
-Ref to the anchor in footnote:
-@ref{Anchor in footnote}.
-
-@footnote{In footnote.
-
-@anchor{Anchor in footnote}
-
-Ref to main text anchor
-@ref{An anchor}
-}
-
-@float , float anchor
-In float
-@end float
-
-Ref to float
-@ref{float anchor}.
-
-@menu
-* An anchor:: menu entry pointing to the anchor.
-@end menu
-
-@cindex index entry
-
-@section section
-
-Ref to anchor
-@ref{An anchor}
-
-Ref to footnote anchor
-@ref{Anchor in footnote}
-',{},{'FORMAT_MENU' => 'menu'}],
-['placed_things_before_node',
-'@anchor{An anchor}
-
-Ref to the anchor:
-@ref{An anchor}
-
-Ref to the anchor in footnote:
-@ref{Anchor in footnote}.
-
-@footnote{In footnote.
-
-@anchor{Anchor in footnote}
-
-Ref to main text anchor
-@ref{An anchor}
-}
-
-@float , float anchor
-In float
-@end float
-
-Ref to float
-@ref{float anchor}.
-
-@menu
-* An anchor:: menu entry pointing to the anchor.
-@end menu
-
-@cindex index entry
-
-@node Top
-@top top section
-
-Ref to anchor
-@ref{An anchor}
-
-Ref to footnote anchor
-@ref{Anchor in footnote}
-'],
['explicit_node_directions',
'@node Top
Top node
@@ -896,50 +785,6 @@ $unnumbered_top_without_node_text,
['unnumbered_top_without_node_nodes',
$unnumbered_top_without_node_text,
{'test_split' => 'node'}],
-['more_sections_than_nodes',
-'@node Top
-@top top
-
-@menu
-* n c2::
-* n c3::
-* n c3 s1 s2::
-@end menu
-
-@chapter c1
-
-@node n c2
-@chapter c2
-
-@section s1
-
-@node n c3, n c3 s1 s2, n c2, Top
-@chapter c3
-
-@menu
-* n c3 s 2::
-@end menu
-
-@section C3 s1
-
-@node n c3 s 2
-@section c3 s2
-
-@section c3 s3
-
-@chapter c4
-
-@section c3 s1
-
-@subsection c3 s1 s1
-
-@node n c3 s1 s2,,n c3,Top
-@subsection c3 s1 s2
-
-@appendix appendix
-', {},
-# to test texi2html style directions in that case
-{'TEXI2HTML' => 1}],
['space_in_node',
'
@node Top
@@ -998,80 +843,9 @@ $unnumbered_top_without_node_text,
@node subsection
@subsection subsection
', {'CHECK_NORMAL_MENU_STRUCTURE' => 1}],
-['empty_top_node_up',
-'@node Top
-@top empty top node up
-
-@menu
-* first::
-@end menu
-
-@node first
-',{},{'TOP_NODE_UP' => ''}
-],
['node_up_direction_for_top_with_manual',
'@node Top,,,(dir)top
'],
-['internal_top_node_up',
-'@node Top
-@top internal top node up
-
-@menu
-* first::
-@end menu
-
-@node first
-',{'test_split' => 'node'}, {'TOP_NODE_UP' => 'node@@ node'}
-],
-['top_node_up_url',
-'@node Top
-@top internal top node up
-
-@menu
-* first::
-@end menu
-
-@node first
-',{'test_split' => 'node'},
- {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
- 'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
-],
-['non_automatic_top_node_up_url',
-'@node Top, first, (dir), (dir)
-@top internal top node up
-
-@menu
-* first::
-@end menu
-
-@node first, , Top, (dir)
-',{'test_split' => 'node'},{'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
-],
-['non_automatic_internal_top_node_up',
-'@node Top, first, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals,
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
-@top internal top node up
-
-@menu
-* first::
-@end menu
-
-@node first, , Top, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
-',{'test_split' => 'node'},
- {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals'}
-],
-['non_automatic_top_node_up_and_url',
-'@node Top, first, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals,
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
-@top internal top node up
-
-@menu
-* first::
-@end menu
-
-@node first, , Top, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
-',{'test_split' => 'node'},
- {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
- 'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
-],
['protected_node_parentheses',
'
@node Top
@@ -1789,7 +1563,6 @@ my @xml_tests_info_tests = ('part_chapter_after_top',
'section_node_before_part', 'top_node_part_top',
'chapter_node_before_and_after_part',
'in_menu_only_special_spaces_node',
- 'more_sections_than_nodes',
'more_nodes_than_sections', 'part_node_chapter_appendix',
'part_node_part_appendix', 'part_node_chapter_node_appendix',
'part_node_part_node_appendix', 'part_node_node_part_appendix',
diff --git a/tp/t/40moresectioning.t b/tp/t/40moresectioning.t
index 06eeade1c5..6a0028f734 100644
--- a/tp/t/40moresectioning.t
+++ b/tp/t/40moresectioning.t
@@ -122,6 +122,232 @@ $anchor_in_footnote_text
['section_in_unnumbered_info',
undef, {'test_file' => 'section_in_unnumbered_text.texi'},
],
+['more_sections_than_nodes',
+'@node Top
+@top top
+
+@menu
+* n c2::
+* n c3::
+* n c3 s1 s2::
+@end menu
+
+@chapter c1
+
+@node n c2
+@chapter c2
+
+@section s1
+
+@node n c3, n c3 s1 s2, n c2, Top
+@chapter c3
+
+@menu
+* n c3 s 2::
+@end menu
+
+@section C3 s1
+
+@node n c3 s 2
+@section c3 s2
+
+@section c3 s3
+
+@chapter c4
+
+@section c3 s1
+
+@subsection c3 s1 s1
+
+@node n c3 s1 s2,,n c3,Top
+@subsection c3 s1 s2
+
+@appendix appendix
+', {},
+# to test texi2html style directions in that case
+{'TEXI2HTML' => 1}],
+['no_element',
+'@settitle no_element test
+@documentencoding ISO-8859-1
+
+
+@anchor{An anchor}
+
+Ref to the anchor:
+@ref{An anchor}
+
+Ref to the anchor in footnote:
+@ref{Anchor in footnote}.
+
+@footnote{In footnote.
+
+@anchor{Anchor in footnote}
+
+Ref to main text anchor
+@ref{An anchor}
+}
+
+@float , float anchor
+In float
+@end float
+
+Ref to float
+@ref{float anchor}.
+
+@menu
+* An anchor:: menu entry pointing to the anchor.
+@end menu
+
+@cindex index entry
+', {}, {'SHOW_TITLE' => 1}],
+['placed_things_before_element',
+'@anchor{An anchor}
+
+Ref to the anchor:
+@ref{An anchor}
+
+Ref to the anchor in footnote:
+@ref{Anchor in footnote}.
+
+@footnote{In footnote.
+
+@anchor{Anchor in footnote}
+
+Ref to main text anchor
+@ref{An anchor}
+}
+
+@float , float anchor
+In float
+@end float
+
+Ref to float
+@ref{float anchor}.
+
+@menu
+* An anchor:: menu entry pointing to the anchor.
+@end menu
+
+@cindex index entry
+
+@section section
+
+Ref to anchor
+@ref{An anchor}
+
+Ref to footnote anchor
+@ref{Anchor in footnote}
+',{},{'FORMAT_MENU' => 'menu'}],
+['placed_things_before_node',
+'@anchor{An anchor}
+
+Ref to the anchor:
+@ref{An anchor}
+
+Ref to the anchor in footnote:
+@ref{Anchor in footnote}.
+
+@footnote{In footnote.
+
+@anchor{Anchor in footnote}
+
+Ref to main text anchor
+@ref{An anchor}
+}
+
+@float , float anchor
+In float
+@end float
+
+Ref to float
+@ref{float anchor}.
+
+@menu
+* An anchor:: menu entry pointing to the anchor.
+@end menu
+
+@cindex index entry
+
+@node Top
+@top top section
+
+Ref to anchor
+@ref{An anchor}
+
+Ref to footnote anchor
+@ref{Anchor in footnote}
+'],
+['empty_top_node_up',
+'@node Top
+@top empty top node up
+
+@menu
+* first::
+@end menu
+
+@node first
+',{},{'TOP_NODE_UP' => ''}
+],
+['internal_top_node_up',
+'@node Top
+@top internal top node up
+
+@menu
+* first::
+@end menu
+
+@node first
+',{'test_split' => 'node'}, {'TOP_NODE_UP' => 'node@@ node'}
+],
+['top_node_up_url',
+'@node Top
+@top internal top node up
+
+@menu
+* first::
+@end menu
+
+@node first
+',{'test_split' => 'node'},
+ {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
+ 'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
+],
+['non_automatic_top_node_up_url',
+'@node Top, first, (dir), (dir)
+@top internal top node up
+
+@menu
+* first::
+@end menu
+
+@node first, , Top, (dir)
+',{'test_split' => 'node'},{'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
+],
+['non_automatic_internal_top_node_up',
+'@node Top, first, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals,
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
+@top internal top node up
+
+@menu
+* first::
+@end menu
+
+@node first, , Top, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
+',{'test_split' => 'node'},
+ {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals'}
+],
+['non_automatic_top_node_up_and_url',
+'@node Top, first, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals,
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
+@top internal top node up
+
+@menu
+* first::
+@end menu
+
+@node first, , Top, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
+',{'test_split' => 'node'},
+ {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
+ 'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
+],
);
@@ -183,6 +409,7 @@ foreach my $test (@test_cases) {
my %xml_tests_info_tests = (
'only_special_spaces_node' => 1,
+ 'more_sections_than_nodes' => 1,
);
my %docbook_tests_info_tests = (
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl
b/tp/t/results/moresectioning/empty_top_node_up.pl
similarity index 100%
rename from tp/t/results/sectioning/empty_top_node_up.pl
rename to tp/t/results/moresectioning/empty_top_node_up.pl
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl
b/tp/t/results/moresectioning/internal_top_node_up.pl
similarity index 100%
rename from tp/t/results/sectioning/internal_top_node_up.pl
rename to tp/t/results/moresectioning/internal_top_node_up.pl
diff --git a/tp/t/results/sectioning/more_sections_than_nodes.pl
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
similarity index 100%
rename from tp/t/results/sectioning/more_sections_than_nodes.pl
rename to tp/t/results/moresectioning/more_sections_than_nodes.pl
diff --git a/tp/t/results/sectioning/no_element.pl
b/tp/t/results/moresectioning/no_element.pl
similarity index 100%
rename from tp/t/results/sectioning/no_element.pl
rename to tp/t/results/moresectioning/no_element.pl
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
similarity index 100%
rename from tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
rename to tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
similarity index 100%
rename from tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
rename to tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
similarity index 100%
rename from tp/t/results/sectioning/non_automatic_top_node_up_url.pl
rename to tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl
b/tp/t/results/moresectioning/placed_things_before_element.pl
similarity index 100%
rename from tp/t/results/sectioning/placed_things_before_element.pl
rename to tp/t/results/moresectioning/placed_things_before_element.pl
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl
b/tp/t/results/moresectioning/placed_things_before_node.pl
similarity index 100%
rename from tp/t/results/sectioning/placed_things_before_node.pl
rename to tp/t/results/moresectioning/placed_things_before_node.pl
diff --git a/tp/t/results/sectioning/top_node_up_url.pl
b/tp/t/results/moresectioning/top_node_up_url.pl
similarity index 100%
rename from tp/t/results/sectioning/top_node_up_url.pl
rename to tp/t/results/moresectioning/top_node_up_url.pl