branch master updated: It TEST is set, do not use system init file directories

[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 14cfc98c0e It TEST is set, do not use system init file directories
14cfc98c0e is described below

commit 14cfc98c0e93c17365040c75dc9c6d8ceb240283
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 7 12:14:24 2022 +0200

    It TEST is set, do not use system init file directories
    
    * tp/texi2any.pl: if TEST is set, do not use system (program) init
    directories to find init files, such that the init files are only
    found in source directory.  Report from Gavin.
---
 ChangeLog                                                  | 8 ++++++++
 tp/TODO                                                    | 2 --
 tp/tests/many_input_files/tex_t4ht.sh                      | 4 ++--
 tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh | 4 ++--
 tp/tests/run_parser_all.sh                                 | 2 +-
 tp/texi2any.pl                                             | 6 +++++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ca4d48e12..0beb5cd426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-07  Patrice Dumas  <pertusus@free.fr>
+
+       It TEST is set, do not use system init file directories
+
+       * tp/texi2any.pl: if TEST is set, do not use system (program) init
+       directories to find init files, such that the init files are only
+       found in source directory.  Report from Gavin.
+
 2022-08-07  Patrice Dumas  <pertusus@free.fr>
 
        Ignore ENABLE_ENCODING for plain text in more output formats
diff --git a/tp/TODO b/tp/TODO
index dc9babba9c..a8d1fde0b8 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -20,8 +20,6 @@ Before next release
 Bugs
 ====
 
-If TEST is set, do not use out of source init files directories.
-
 HTML5 validation to check
 -------------------------
 
diff --git a/tp/tests/many_input_files/tex_t4ht.sh 
b/tp/tests/many_input_files/tex_t4ht.sh
index deb04017db..80028bd467 100755
--- a/tp/tests/many_input_files/tex_t4ht.sh
+++ b/tp/tests/many_input_files/tex_t4ht.sh
@@ -35,8 +35,8 @@ raw_outdir=$raw_output_dir/$basename
 [ -d $raw_outdir ] && rm -rf $raw_outdir
 mkdir $basename
 : > $basename/$stdout_file
-echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 
'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir 
$srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ 
$srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> 
$basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' 
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file 
tex4ht.pm --iftex --out $basename/  $srcdir/../tex_html/tex_complex.texi 
$srcdir/../tex_html/tex.texi --force >> $basename/$stdout_file 
2>$basename/${basename}.2
+echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 
'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir 
$srcdir/../../ext --init-file tex4ht.pm --iftex --out $basename/ 
$srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> 
$basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
+$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' 
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../ext --init-file 
tex4ht.pm --iftex --out $basename/  $srcdir/../tex_html/tex_complex.texi 
$srcdir/../tex_html/tex.texi --force >> $basename/$stdout_file 
2>$basename/${basename}.2
 
 return_code=0
 ret=$?
diff --git a/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh 
b/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh
index ebe2d08828..1968a15478 100755
--- a/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh
@@ -39,8 +39,8 @@ mkdir $basename
 
 # note that it is important to have -c 'COMMAND_LINE_ENCODING UTF-8' before 
--out
 # such that --out is correctly decoded
-echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 
'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir 
$srcdir/../../init --init-file tex4ht.pm --iftex -c 'COMMAND_LINE_ENCODING 
UTF-8' --out $basename/encodé/ $srcdir/../tex_html/tex_encodé_utf8.texi 
$srcdir/../tex_html/tex_complex.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force 
>> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' 
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file 
tex4ht.pm --iftex -c 'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/ 
$srcdir/../tex_html/tex_encodé_utf8.texi $srcdir/../tex_html/tex_complex.texi 
-c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force >> $basename/$stdout_file 
2>$basename/${basename}.2
+echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 
'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir 
$srcdir/../../ext --init-file tex4ht.pm --iftex -c 'COMMAND_LINE_ENCODING 
UTF-8' --out $basename/encodé/ $srcdir/../tex_html/tex_encodé_utf8.texi 
$srcdir/../tex_html/tex_complex.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force 
>> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
+$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' 
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../ext --init-file 
tex4ht.pm --iftex -c 'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/ 
$srcdir/../tex_html/tex_encodé_utf8.texi $srcdir/../tex_html/tex_complex.texi 
-c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force >> $basename/$stdout_file 
2>$basename/${basename}.2
 
 return_code=0
 ret=$?
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index 8128084c3e..cfd24aebfe 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -364,7 +364,7 @@ while read line; do
     mkdir "${outdir}$dir"
     remaining_out_dir=`echo $remaining | sed 
's,@OUT_DIR@,'"${outdir}$dir/"',g'`
     echo "$command $dir -> ${outdir}$dir" >> $logfile
-    cmd="$prepended_command $PERL -w $command_run $format_option --force 
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init -I $srcdir/$testdir -I 
$testdir/ -I $srcdir/ -I .  --error-limit=1000 -c TEST=1 $l2h_flags --output 
${outdir}$dir/ $remaining_out_dir $src_file > ${outdir}$dir/$basename.1 
2>${outdir}$dir/$basename.2"
+    cmd="$prepended_command $PERL -w $command_run $format_option --force 
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init --conf-dir 
$srcdir/../ext -I $srcdir/$testdir -I $testdir/ -I $srcdir/ -I .  
--error-limit=1000 -c TEST=1 $l2h_flags --output ${outdir}$dir/ 
$remaining_out_dir $src_file > ${outdir}$dir/$basename.1 
2>${outdir}$dir/$basename.2"
     echo "$cmd" >>$logfile
     eval $cmd
     ret=$?
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 54288a6177..7c1d553687 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1022,7 +1022,11 @@ There is NO WARRANTY, to the extent permitted by 
law.\n"), "2021");
     push @texi2dvi_args, "--command=\@clear $_[1]";
  },
  'init-file=s' => sub {
-    locate_and_load_init_file($_[1], [ @conf_dirs, @program_init_dirs ]);
+    if (get_conf('TEST')) {
+      locate_and_load_init_file($_[1], [ @conf_dirs ]);
+    } else {
+      locate_and_load_init_file($_[1], [ @conf_dirs, @program_init_dirs ]);
+    }
  },
  'set-customization-variable|c=s' => sub {
    my $var_val;