[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres,
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/80include.t: add test_two_include test in 80include.t which is an inlining of the t/input_files/test_two_include.texi file. Remove t/input_files/test_two_include.texi. Move version.texi from t/input_files/ to t/include/. Remove the t/input_files/unknown_nodes_renamed.texi and t/input_files/unknown_nodes_renamed-noderename.cnf unused files. |
|
Date: |
Mon, 02 Jan 2023 18:02:33 -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 d5e7e41d28 * tp/Makefile.am (test_files), tp/Makefile.tres,
tp/t/80include.t: add test_two_include test in 80include.t which is an inlining
of the t/input_files/test_two_include.texi file. Remove
t/input_files/test_two_include.texi. Move version.texi from t/input_files/ to
t/include/. Remove the t/input_files/unknown_nodes_renamed.texi and
t/input_files/unknown_nodes_renamed-noderename.cnf unused files.
d5e7e41d28 is described below
commit d5e7e41d285eb142f4dc013bfb4918242e43ec94
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 00:02:22 2023 +0100
* tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/80include.t:
add test_two_include test in 80include.t which is an inlining of the
t/input_files/test_two_include.texi file. Remove
t/input_files/test_two_include.texi. Move version.texi from
t/input_files/ to t/include/.
Remove the t/input_files/unknown_nodes_renamed.texi and
t/input_files/unknown_nodes_renamed-noderename.cnf unused files.
---
ChangeLog | 10 +
tp/Makefile.am | 5 +-
tp/Makefile.tres | 1 +
tp/t/80include.t | 9 +
tp/t/{input_files => include}/version.texi | 0
tp/t/input_files/test_two_include.texi | 15 --
.../unknown_nodes_renamed-noderename.cnf | 4 -
tp/t/input_files/unknown_nodes_renamed.texi | 1 -
tp/t/results/include/test_two_include.pl | 258 +++++++++++++++++++++
9 files changed, 279 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a63f4627ca..b11e1f6c84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-01-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/80include.t:
+ add test_two_include test in 80include.t which is an inlining of the
+ t/input_files/test_two_include.texi file. Remove
+ t/input_files/test_two_include.texi. Move version.texi from
+ t/input_files/ to t/include/.
+ Remove the t/input_files/unknown_nodes_renamed.texi and
+ t/input_files/unknown_nodes_renamed-noderename.cnf unused files.
+
2023-01-02 Patrice Dumas <pertusus@free.fr>
* tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/92formatting.t:
diff --git a/tp/Makefile.am b/tp/Makefile.am
index b221f456b4..ae2d720013 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -153,6 +153,7 @@ test_files = \
t/include/this_is_a_long_unknown_file.png \
t/include/verbatim_encoded.texi \
t/include/verbatim_encoded_latin1.texi \
+ t/include/version.texi \
t/include/words.txt \
t/include/f--ile.png \
t/include/f--ile.txt \
@@ -241,13 +242,9 @@ test_files = \
t/input_files/simplest_no_node_section.texi \
t/input_files/special_spaces_in_nodes.texi \
t/input_files/test_refs.texi \
- t/input_files/test_two_include.texi \
t/input_files/topic_guide.texi \
t/input_files/things_before_setfilename_no_element.texi \
t/input_files/things_before_setfilename.texi \
- t/input_files/unknown_nodes_renamed.texi \
- t/input_files/unknown_nodes_renamed-noderename.cnf \
- t/input_files/version.texi \
t/input_files/htmlxref.cnf \
t/input_files/htmlxref-mono.cnf \
t/input_files/htmlxref-split.cnf \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index e596a05c13..12dc1b7f63 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -767,6 +767,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/include/no_eol_in_included_file.pl \
t/results/include/simple.pl \
t/results/include/simple_no_eol.pl \
+ t/results/include/test_two_include.pl \
t/results/include/value_expansion_in_include.pl \
t/results/include/verbatiminclude_and_encoding.pl \
t/results/include/verbatiminclude_and_encoding_latin1.pl \
diff --git a/tp/t/80include.t b/tp/t/80include.t
index 9beda92928..f61b47e75c 100644
--- a/tp/t/80include.t
+++ b/tp/t/80include.t
@@ -23,6 +23,15 @@ Following
Call macro
@themacro{}
'],
+['test_two_include',
+'Include version
+@include version.texi
+
+include inc_file
+@include inc_file.texi
+
+After inclusion.
+'],
['value_expansion_in_include',
'@set testvar incl-incl.txi
diff --git a/tp/t/input_files/version.texi b/tp/t/include/version.texi
similarity index 100%
rename from tp/t/input_files/version.texi
rename to tp/t/include/version.texi
diff --git a/tp/t/input_files/test_two_include.texi
b/tp/t/input_files/test_two_include.texi
deleted file mode 100644
index c07dcd567f..0000000000
--- a/tp/t/input_files/test_two_include.texi
+++ /dev/null
@@ -1,15 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@setfilename test_two_include.info
-
-@node Top
-
-Include version
-@include version.texi
-
-include inc_file
-@include inc_file.texi
-
-After inclusion.
-
-@bye
diff --git a/tp/t/input_files/unknown_nodes_renamed-noderename.cnf
b/tp/t/input_files/unknown_nodes_renamed-noderename.cnf
deleted file mode 100644
index 88c6ef620f..0000000000
--- a/tp/t/input_files/unknown_nodes_renamed-noderename.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-Unknown node 1
-unknown node 2
-@@{} renamed as unknow too
-
diff --git a/tp/t/input_files/unknown_nodes_renamed.texi
b/tp/t/input_files/unknown_nodes_renamed.texi
deleted file mode 100644
index 32b75f1dc5..0000000000
--- a/tp/t/input_files/unknown_nodes_renamed.texi
+++ /dev/null
@@ -1 +0,0 @@
-@node Top
diff --git a/tp/t/results/include/test_two_include.pl
b/tp/t/results/include/test_two_include.pl
new file mode 100644
index 0000000000..772c295e87
--- /dev/null
+++ b/tp/t/results/include/test_two_include.pl
@@ -0,0 +1,258 @@
+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{'test_two_include'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Include version
+'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'UPDATED',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => '28 March 2002',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'UPDATED',
+ '28 March 2002'
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' UPDATED 28 March 2002
+'
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'UPDATED-MONTH',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => 'March 2002',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'UPDATED-MONTH',
+ 'March 2002'
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' UPDATED-MONTH March 2002
+'
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'EDITION',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => '4.2',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'EDITION',
+ '4.2'
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' EDITION 4.2
+'
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'VERSION',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => '4.2',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'VERSION',
+ '4.2'
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' VERSION 4.2
+'
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'VERSION_DATE',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => 'October 2002',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'VERSION_DATE',
+ 'October 2002'
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' VERSION_DATE October 2002
+'
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'SHORT_VERSION',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => '2-0',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'SHORT_VERSION',
+ '2-0'
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' SHORT_VERSION 2-0
+'
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => 'RPM_VERSION',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'text' => '2.0.4',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'misc_args' => [
+ 'RPM_VERSION',
+ '2.0.4'
+ ]
+ },
+ 'info' => {
+ 'arg_line' => ' RPM_VERSION 2.0.4
+'
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'include inc_file
+'
+ },
+ {
+ 'text' => 'In included file.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'After inclusion.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'test_two_include'} = 'Include version
+@set UPDATED 28 March 2002
+@set UPDATED-MONTH March 2002
+@set EDITION 4.2
+@set VERSION 4.2
+
+@set VERSION_DATE October 2002
+@set SHORT_VERSION 2-0
+@set RPM_VERSION 2.0.4
+
+include inc_file
+In included file.
+
+After inclusion.
+';
+
+
+$result_texts{'test_two_include'} = 'Include version
+
+
+include inc_file
+In included file.
+
+After inclusion.
+';
+
+$result_errors{'test_two_include'} = [];
+
+
+$result_floats{'test_two_include'} = {};
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/80include.t: add test_two_include test in 80include.t which is an inlining of the t/input_files/test_two_include.texi file. Remove t/input_files/test_two_include.texi. Move version.texi from t/input_files/ to t/include/. Remove the t/input_files/unknown_nodes_renamed.texi and t/input_files/unknown_nodes_renamed-noderename.cnf unused files.,
Patrice Dumas <=