branch master updated: * tp/t/test_utils.pl (convert_to_plaintext): set OUTFILE to undef if SPLIT and SUBDIR is set, such that SUBDIR is used to determine the destination directory.

[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 60d33bf4e2 * tp/t/test_utils.pl (convert_to_plaintext): set OUTFILE to 
undef if SPLIT and SUBDIR is set, such that SUBDIR is used to determine the 
destination directory.
60d33bf4e2 is described below

commit 60d33bf4e26889987486dd5d79a0a25bb72e3c09
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 4 08:48:40 2023 +0100

    * tp/t/test_utils.pl (convert_to_plaintext): set OUTFILE to undef
    if SPLIT and SUBDIR is set, such that SUBDIR is used to determine the
    destination directory.
---
 ChangeLog                                                   |  6 ++++++
 .../index_nodes/res_plaintext/{index_nodes.txt => }/Top.txt |  0
 .../res_plaintext/{index_nodes.txt => }/a-node.txt          |  0
 .../res_plaintext/{index_nodes.txt => }/another.txt         |  0
 .../res_plaintext/{index_nodes.txt => }/first.txt           |  0
 .../res_plaintext/{index_nodes.txt => }/second.txt          |  0
 .../{index_special_region.txt => }/Copying-and-indices.txt  |  0
 .../res_plaintext/{index_special_region.txt => }/Top.txt    |  0
 .../Copying-and-indices.txt                                 |  0
 .../{index_special_region_no_insertcopying.txt => }/Top.txt |  0
 .../Chapter.txt                                             |  0
 .../Copying-and-indices.txt                                 |  0
 .../Top.txt                                                 |  0
 .../Chapter.txt                                             |  0
 .../Copying-and-indices.txt                                 |  0
 .../Top.txt                                                 |  0
 .../Chapter.txt                                             |  0
 .../Copying-and-indices.txt                                 |  0
 .../Top.txt                                                 |  0
 .../Chapter.txt                                             |  0
 .../Copying-and-indices.txt                                 |  0
 .../Top.txt                                                 |  0
 .../Chapter.txt                                             |  0
 .../Copying-and-indices.txt                                 |  0
 .../Top.txt                                                 |  0
 .../Chapter.txt                                             |  0
 .../Copying-and-indices.txt                                 |  0
 .../Top.txt                                                 |  0
 .../{index_table_chapter_no_node.txt => }/Top.txt           |  0
 .../{index_table_chapter_no_node.txt => }/indices-refs.txt  |  0
 .../node-with-ftable-and-vtable.txt                         |  0
 .../node-with-printindex.txt                                |  0
 tp/t/test_utils.pl                                          | 13 ++++++++++---
 33 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 77ef22ad9b..66ca1f4196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/t/test_utils.pl (convert_to_plaintext): set OUTFILE to undef
+       if SPLIT and SUBDIR is set, such that SUBDIR is used to determine the
+       destination directory.
+
 2023-01-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/maintain/regenerate_file_lists.pl, tp/Makefile.tres: list res_*
diff --git 
a/tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/Top.txt 
b/tp/t/results/indices/index_nodes/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/Top.txt
rename to tp/t/results/indices/index_nodes/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/a-node.txt 
b/tp/t/results/indices/index_nodes/res_plaintext/a-node.txt
similarity index 100%
rename from 
tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/a-node.txt
rename to tp/t/results/indices/index_nodes/res_plaintext/a-node.txt
diff --git 
a/tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/another.txt 
b/tp/t/results/indices/index_nodes/res_plaintext/another.txt
similarity index 100%
rename from 
tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/another.txt
rename to tp/t/results/indices/index_nodes/res_plaintext/another.txt
diff --git 
a/tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/first.txt 
b/tp/t/results/indices/index_nodes/res_plaintext/first.txt
similarity index 100%
rename from 
tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/first.txt
rename to tp/t/results/indices/index_nodes/res_plaintext/first.txt
diff --git 
a/tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/second.txt 
b/tp/t/results/indices/index_nodes/res_plaintext/second.txt
similarity index 100%
rename from 
tp/t/results/indices/index_nodes/res_plaintext/index_nodes.txt/second.txt
rename to tp/t/results/indices/index_nodes/res_plaintext/second.txt
diff --git 
a/tp/t/results/indices/index_special_region/res_plaintext/index_special_region.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region/res_plaintext/index_special_region.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region/res_plaintext/index_special_region.txt/Top.txt
 b/tp/t/results/indices/index_special_region/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region/res_plaintext/index_special_region.txt/Top.txt
rename to tp/t/results/indices/index_special_region/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/index_special_region_no_insertcopying.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/index_special_region_no_insertcopying.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/index_special_region_no_insertcopying.txt/Top.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/index_special_region_no_insertcopying.txt/Top.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_no_titlepage_no_nodes.txt/Chapter.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Chapter.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_no_titlepage_no_nodes.txt/Chapter.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Chapter.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_no_titlepage_no_nodes.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_no_titlepage_no_nodes.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_no_titlepage_no_nodes.txt/Top.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_no_titlepage_no_nodes.txt/Top.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes.txt/Chapter.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Chapter.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes.txt/Chapter.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Chapter.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes.txt/Top.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes.txt/Top.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.txt/Chapter.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Chapter.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.txt/Chapter.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Chapter.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.txt/Top.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.txt/Top.txt
rename to 
tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/index_special_region_no_titlepage_no_nodes.txt/Chapter.txt
 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Chapter.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/index_special_region_no_titlepage_no_nodes.txt/Chapter.txt
rename to 
tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Chapter.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/index_special_region_no_titlepage_no_nodes.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/index_special_region_no_titlepage_no_nodes.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/index_special_region_no_titlepage_no_nodes.txt/Top.txt
 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/index_special_region_no_titlepage_no_nodes.txt/Top.txt
rename to 
tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/index_special_region_titlepage_no_nodes.txt/Chapter.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Chapter.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/index_special_region_titlepage_no_nodes.txt/Chapter.txt
rename to 
tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Chapter.txt
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/index_special_region_titlepage_no_nodes.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/index_special_region_titlepage_no_nodes.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/index_special_region_titlepage_no_nodes.txt/Top.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/index_special_region_titlepage_no_nodes.txt/Top.txt
rename to 
tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_titlepage_no_nodes_footnotes_default.txt/Chapter.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Chapter.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_titlepage_no_nodes_footnotes_default.txt/Chapter.txt
rename to 
tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Chapter.txt
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_titlepage_no_nodes_footnotes_default.txt/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_titlepage_no_nodes_footnotes_default.txt/Copying-and-indices.txt
rename to 
tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_titlepage_no_nodes_footnotes_default.txt/Top.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/index_special_region_titlepage_no_nodes_footnotes_default.txt/Top.txt
rename to 
tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/Top.txt
 b/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/Top.txt
similarity index 100%
rename from 
tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/Top.txt
rename to tp/t/results/indices/index_table_chapter_no_node/res_plaintext/Top.txt
diff --git 
a/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/indices-refs.txt
 
b/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/indices-refs.txt
similarity index 100%
rename from 
tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/indices-refs.txt
rename to 
tp/t/results/indices/index_table_chapter_no_node/res_plaintext/indices-refs.txt
diff --git 
a/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/node-with-ftable-and-vtable.txt
 
b/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/node-with-ftable-and-vtable.txt
similarity index 100%
rename from 
tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/node-with-ftable-and-vtable.txt
rename to 
tp/t/results/indices/index_table_chapter_no_node/res_plaintext/node-with-ftable-and-vtable.txt
diff --git 
a/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/node-with-printindex.txt
 
b/tp/t/results/indices/index_table_chapter_no_node/res_plaintext/node-with-printindex.txt
similarity index 100%
rename from 
tp/t/results/indices/index_table_chapter_no_node/res_plaintext/index_table_chapter_no_node.txt/node-with-printindex.txt
rename to 
tp/t/results/indices/index_table_chapter_no_node/res_plaintext/node-with-printindex.txt
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index e02440ac7c..f4090589d6 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -575,8 +575,14 @@ sub convert_to_plaintext($$$$$$;$)
                                     $main_configuration, $format);
   if (!defined($converter_options->{'OUTFILE'})
       and defined($converter_options->{'SUBDIR'})) {
-    $converter_options->{'OUTFILE'}
-      = $converter_options->{'SUBDIR'}.$test_name.".txt";
+    # need to set OUTFILE in any case otherwise the default of -
+    # will be used
+    if ($converter_options->{'SPLIT'}) {
+      $converter_options->{'OUTFILE'} = undef;
+    } else {
+      $converter_options->{'OUTFILE'}
+        = $converter_options->{'SUBDIR'}.$test_name.".txt";
+    }
   }
   
   my $converter =
@@ -585,7 +591,8 @@ sub convert_to_plaintext($$$$$$;$)
                                              'converted_format' => 'plaintext',
                                              %$converter_options });
   my $result;
-  if ($converter_options->{'OUTFILE'} eq '') {
+  if (defined($converter_options->{'OUTFILE'})
+      and $converter_options->{'OUTFILE'} eq '') {
     $result = $converter->convert($tree);
   } else {
     $result = $converter->output($tree);