[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.am (test_files), tp/t/40moresection
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.am (test_files), tp/t/40moresectioning.t: inline the contents_at_end_document_after_node, contents_at_end_document and contents_in_document tests. Remove the Texinfo files. |
|
Date: |
Tue, 03 Jan 2023 17:19:05 -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 2286e9678a * tp/Makefile.am (test_files), tp/t/40moresectioning.t:
inline the contents_at_end_document_after_node, contents_at_end_document and
contents_in_document tests. Remove the Texinfo files.
2286e9678a is described below
commit 2286e9678a2e05d1702ab76f48527168911816c4
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 23:18:55 2023 +0100
* tp/Makefile.am (test_files), tp/t/40moresectioning.t: inline the
contents_at_end_document_after_node, contents_at_end_document and
contents_in_document tests. Remove the Texinfo files.
---
ChangeLog | 10 ++-
tp/Makefile.am | 3 -
tp/t/40moresectioning.t | 31 +++++++-
tp/t/input_files/contents_at_end_document.texi | 11 ---
.../contents_at_end_document_after_node.texi | 17 -----
tp/t/input_files/contents_in_document.texi | 10 ---
.../moresectioning/contents_at_end_document.pl | 74 +++----------------
.../contents_at_end_document_after_node.pl | 86 +++++-----------------
.../results/moresectioning/contents_in_document.pl | 61 +++------------
9 files changed, 73 insertions(+), 230 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8f7ceb9bd6..31d9f36590 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,21 @@
+2023-01-03 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.am (test_files), tp/t/40moresectioning.t: inline the
+ contents_at_end_document_after_node, contents_at_end_document and
+ contents_in_document tests. Remove the Texinfo files.
+
2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (output, _html_set_pages_files): set
element units next and prev in output and not in
- _html_set_pages_files, in order to do it even if th efile is not set.
+ _html_set_pages_files, in order to do it even if the file is not set.
* tp/t/40moresectioning.t, tp/Makefile.tres, tp/t/converters_tests.t,
tp/tests/contents/list-of-tests: inline contents_at_document_begin.texi
test in tp/t/40moresectioning.t. Replace
contents_at_document_begin.texi contents with the
tests/contents/contents_at_begin.texi file contents, without
- @setfilenale. Add contents_at_document_begin,
+ @setfilename. Add contents_at_document_begin,
contents_at_document_begin_inline and
contents_at_document_begin_separate_element tests in
tp/t/converters_tests.t and remove the contents_at_begin,
diff --git a/tp/Makefile.am b/tp/Makefile.am
index aa4661461c..47fdf595ef 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -189,9 +189,6 @@ test_files = \
t/input_files/complex_sectioning_case.texi \
t/input_files/cond.texi \
t/input_files/contents_at_document_begin.texi \
- t/input_files/contents_at_end_document_after_node.texi \
- t/input_files/contents_at_end_document.texi \
- t/input_files/contents_in_document.texi \
t/input_files/cpp_line_before_first_node.texi \
t/input_files/cpp_lines.texi \
t/input_files/cpp_line_latin1.texi \
diff --git a/tp/t/40moresectioning.t b/tp/t/40moresectioning.t
index 6c07a26032..0062a67208 100644
--- a/tp/t/40moresectioning.t
+++ b/tp/t/40moresectioning.t
@@ -564,11 +564,36 @@ in chap
@chapter chap
'],
['contents_at_end_document_after_node',
-undef, {'test_file' => 'contents_at_end_document_after_node.texi'}],
+'@node Top
+@top contents at end document after node
+
+@menu
+* a node::
+@end menu
+
+@chapter chap
+
+@node a node,,,Top
+
+@contents
+'
+],
['contents_at_end_document',
-undef, {'test_file' => 'contents_at_end_document.texi'}],
+'@node Top
+@top contents at end document
+
+@chapter chap
+
+@contents
+'],
['contents_in_document',
-undef, {'test_file' => 'contents_in_document.texi'}],
+'@node Top
+@top contents in document
+
+@contents
+
+@chapter chap
+'],
);
my @test_out_files = (
diff --git a/tp/t/input_files/contents_at_end_document.texi
b/tp/t/input_files/contents_at_end_document.texi
deleted file mode 100644
index afc3e64502..0000000000
--- a/tp/t/input_files/contents_at_end_document.texi
+++ /dev/null
@@ -1,11 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@node Top
-@top contents at end document
-
-@chapter chap
-
-@contents
-
-@bye
-
diff --git a/tp/t/input_files/contents_at_end_document_after_node.texi
b/tp/t/input_files/contents_at_end_document_after_node.texi
deleted file mode 100644
index 759572fc73..0000000000
--- a/tp/t/input_files/contents_at_end_document_after_node.texi
+++ /dev/null
@@ -1,17 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@node Top
-@top contents at end document after node
-
-@menu
-* a node::
-@end menu
-
-@chapter chap
-
-@node a node,,,Top
-
-@contents
-
-@bye
-
diff --git a/tp/t/input_files/contents_in_document.texi
b/tp/t/input_files/contents_in_document.texi
deleted file mode 100644
index 87917baace..0000000000
--- a/tp/t/input_files/contents_in_document.texi
+++ /dev/null
@@ -1,10 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@node Top
-@top contents in document
-
-@contents
-
-@chapter chap
-
-@bye
diff --git a/tp/t/results/moresectioning/contents_at_end_document.pl
b/tp/t/results/moresectioning/contents_at_end_document.pl
index d7ec321b66..118015514c 100644
--- a/tp/t/results/moresectioning/contents_at_end_document.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document.pl
@@ -8,27 +8,6 @@ use utf8;
$result_trees{'contents_at_end_document'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -65,8 +44,8 @@ $result_trees{'contents_at_end_document'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 3,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -79,7 +58,7 @@ $result_trees{'contents_at_end_document'} = {
}
],
'info' => {
- 'spaces_after_argument' => '
+ 'spaces_after_argument' => '
'
},
'type' => 'line_arg'
@@ -98,8 +77,8 @@ $result_trees{'contents_at_end_document'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 4,
+ 'file_name' => '',
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -135,45 +114,20 @@ $result_trees{'contents_at_end_document'} = {
],
'cmdname' => 'contents',
'source_info' => {
- 'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
}
],
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
- },
- {
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'text_after_end'
- }
- ],
- 'type' => 'postamble_after_end'
}
],
'type' => 'document_root'
@@ -181,17 +135,12 @@ $result_trees{'contents_at_end_document'} = {
$result_trees{'contents_at_end_document'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'contents_at_end_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'contents_at_end_document'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'contents_at_end_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_texis{'contents_at_end_document'} = '\\input texinfo @c -*-texinfo-*-
-
-@node Top
-@top contents at end document
+$result_texis{'contents_at_end_document'} = '@node Top
+@top contents at end document
@chapter chap
@contents
-
-@bye
-
';
@@ -201,7 +150,6 @@ $result_texts{'contents_at_end_document'} = 'contents at
end document
1 chap
******
-
';
$result_sectioning{'contents_at_end_document'} = {
diff --git a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
index 3dd72dd140..4ab0853eb2 100644
--- a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
@@ -8,27 +8,6 @@ use utf8;
$result_trees{'contents_at_end_document_after_node'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -65,8 +44,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 3,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -147,8 +126,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
}
},
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 7,
+ 'file_name' => '',
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'menu_entry'
@@ -176,15 +155,15 @@ $result_trees{'contents_at_end_document_after_node'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -199,8 +178,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 4,
+ 'file_name' => '',
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -231,8 +210,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -282,15 +261,10 @@ $result_trees{'contents_at_end_document_after_node'} = {
],
'cmdname' => 'contents',
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 14,
+ 'file_name' => '',
+ 'line_nr' => 12,
'macro' => ''
}
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
}
],
'extra' => {
@@ -319,30 +293,10 @@ $result_trees{'contents_at_end_document_after_node'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 12,
+ 'file_name' => '',
+ 'line_nr' => 10,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
- },
- {
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'text_after_end'
- }
- ],
- 'type' => 'postamble_after_end'
}
],
'type' => 'document_root'
@@ -355,9 +309,7 @@
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'extra'}{'no
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_texis{'contents_at_end_document_after_node'} = '\\input texinfo @c
-*-texinfo-*-
-
-@node Top
+$result_texis{'contents_at_end_document_after_node'} = '@node Top
@top contents at end document after node
@menu
@@ -369,9 +321,6 @@ $result_texis{'contents_at_end_document_after_node'} =
'\\input texinfo @c -*-te
@node a node,,,Top
@contents
-
-@bye
-
';
@@ -384,7 +333,6 @@ $result_texts{'contents_at_end_document_after_node'} =
'contents at end document
******
-
';
$result_sectioning{'contents_at_end_document_after_node'} = {
diff --git a/tp/t/results/moresectioning/contents_in_document.pl
b/tp/t/results/moresectioning/contents_in_document.pl
index f8a55691cf..39cf0fe363 100644
--- a/tp/t/results/moresectioning/contents_in_document.pl
+++ b/tp/t/results/moresectioning/contents_in_document.pl
@@ -8,27 +8,6 @@ use utf8;
$result_trees{'contents_in_document'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -65,8 +44,8 @@ $result_trees{'contents_in_document'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_in_document.texi',
- 'line_nr' => 3,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -102,8 +81,8 @@ $result_trees{'contents_in_document'} = {
],
'cmdname' => 'contents',
'source_info' => {
- 'file_name' => 'contents_in_document.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -118,8 +97,8 @@ $result_trees{'contents_in_document'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_in_document.texi',
- 'line_nr' => 4,
+ 'file_name' => '',
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -139,31 +118,14 @@ $result_trees{'contents_in_document'} = {
}
],
'cmdname' => 'chapter',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'contents_in_document.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
@@ -171,16 +133,12 @@ $result_trees{'contents_in_document'} = {
$result_trees{'contents_in_document'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'contents_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'contents_in_document'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'contents_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_texis{'contents_in_document'} = '\\input texinfo @c -*-texinfo-*-
-
-@node Top
+$result_texis{'contents_in_document'} = '@node Top
@top contents in document
@contents
@chapter chap
-
-@bye
';
@@ -190,7 +148,6 @@ $result_texts{'contents_in_document'} = 'contents in
document
1 chap
******
-
';
$result_sectioning{'contents_in_document'} = {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.am (test_files), tp/t/40moresectioning.t: inline the contents_at_end_document_after_node, contents_at_end_document and contents_in_document tests. Remove the Texinfo files.,
Patrice Dumas <=