branch master updated: * tp/Makefile.am (test_files), tp/t/input_files/htmlxref-test.cnf, tp/t/htmlxref.t: rename t/input_files/htmlxref.cnf as t/input_files/htmlxref-test.cnf as now the htmlxref.cnf file found along with source files is used and could therefore interact with in-source conversions.

[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 798db96265 * tp/Makefile.am (test_files), 
tp/t/input_files/htmlxref-test.cnf, tp/t/htmlxref.t: rename 
t/input_files/htmlxref.cnf as t/input_files/htmlxref-test.cnf as now the 
htmlxref.cnf file found along with source files is used and could therefore 
interact with in-source conversions.
798db96265 is described below

commit 798db962655968367d6f697788b85bf21b74d991
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Sep 6 08:24:42 2024 +0200

    * tp/Makefile.am (test_files), tp/t/input_files/htmlxref-test.cnf,
    tp/t/htmlxref.t: rename t/input_files/htmlxref.cnf as
    t/input_files/htmlxref-test.cnf as now the htmlxref.cnf file found
    along with source files is used and could therefore interact with
    in-source conversions.
---
 ChangeLog                                            | 10 +++++++++-
 tp/Makefile.am                                       |  2 +-
 tp/t/htmlxref.t                                      |  4 ++--
 tp/t/input_files/{htmlxref.cnf => htmlxref-test.cnf} |  0
 tp/t/results/htmlxref/htmlxref.pl                    |  4 ++--
 tp/t/results/htmlxref/htmlxref_nodes.pl              |  4 ++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 662c73b53e..74dbb1249b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2024-09-05  Patrice Dumas  <pertusus@free.fr>
+2024-09-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.am (test_files), tp/t/input_files/htmlxref-test.cnf,
+       tp/t/htmlxref.t: rename t/input_files/htmlxref.cnf as
+       t/input_files/htmlxref-test.cnf as now the htmlxref.cnf file found
+       along with source files is used and could therefore interact with
+       in-source conversions.
+
+2024-09-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/init/book.pm (book_convert_heading_command): sync with HTML.pm.
 
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 263a4f62d7..0b5e7da84d 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -289,7 +289,7 @@ test_files = \
  t/input_files/things_before_setfilename_no_element.texi \
  t/input_files/things_before_setfilename.texi \
  t/input_files/transliterated_names_conflicts.texi \
- t/input_files/htmlxref.cnf \
+ t/input_files/htmlxref-test.cnf \
  t/input_files/htmlxref-mono.cnf \
  t/input_files/htmlxref-no_urlprefix_first.cnf \
  t/input_files/htmlxref-split.cnf \
diff --git a/tp/t/htmlxref.t b/tp/t/htmlxref.t
index ae19d817c9..f22d94c12b 100644
--- a/tp/t/htmlxref.t
+++ b/tp/t/htmlxref.t
@@ -8,13 +8,13 @@ require 't/test_utils.pl';
 my @test_cases = (
 ['htmlxref',
   undef, {'test_file' => 'test_refs.texi' },
-  {'HTMLXREF_FILE' => 'htmlxref.cnf',
+  {'HTMLXREF_FILE' => 'htmlxref-test.cnf',
    'SPLIT' => '', 'NODE_NAME_IN_MENU' => 0,
    'USE_NODES' => 0}
 ],
 ['htmlxref_nodes',
   undef, {'test_file' => 'test_refs.texi' },
-  {'HTMLXREF_FILE' => 'htmlxref.cnf',
+  {'HTMLXREF_FILE' => 'htmlxref-test.cnf',
    'SPLIT' => 'node',,
    'USE_NODES' => 1}
 ],
diff --git a/tp/t/input_files/htmlxref.cnf b/tp/t/input_files/htmlxref-test.cnf
similarity index 100%
rename from tp/t/input_files/htmlxref.cnf
rename to tp/t/input_files/htmlxref-test.cnf
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 463e68994b..f6ecc439e4 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -2918,7 +2918,7 @@ $result_converted_errors{'file_html'}->{'htmlxref'} = [
   {
     'error_line' => 'warning: unrecognized type: foo
 ',
-    'file_name' => 'htmlxref.cnf',
+    'file_name' => 'htmlxref-test.cnf',
     'line_nr' => 15,
     'text' => 'unrecognized type: foo',
     'type' => 'warning'
@@ -2926,7 +2926,7 @@ $result_converted_errors{'file_html'}->{'htmlxref'} = [
   {
     'error_line' => 'warning: missing type
 ',
-    'file_name' => 'htmlxref.cnf',
+    'file_name' => 'htmlxref-test.cnf',
     'line_nr' => 16,
     'text' => 'missing type',
     'type' => 'warning'
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 5f5eeb4a6b..dbc9b458af 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -2918,7 +2918,7 @@ $result_converted_errors{'file_html'}->{'htmlxref_nodes'} 
= [
   {
     'error_line' => 'warning: unrecognized type: foo
 ',
-    'file_name' => 'htmlxref.cnf',
+    'file_name' => 'htmlxref-test.cnf',
     'line_nr' => 15,
     'text' => 'unrecognized type: foo',
     'type' => 'warning'
@@ -2926,7 +2926,7 @@ $result_converted_errors{'file_html'}->{'htmlxref_nodes'} 
= [
   {
     'error_line' => 'warning: missing type
 ',
-    'file_name' => 'htmlxref.cnf',
+    'file_name' => 'htmlxref-test.cnf',
     'line_nr' => 16,
     'text' => 'missing type',
     'type' => 'warning'