texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch release/7.0 updated: * tp/tests/Makefile.am: Call maintain/copy_c


From: Gavin D. Smith
Subject: branch release/7.0 updated: * tp/tests/Makefile.am: Call maintain/copy_change_file_name_encoding.pl to create files in built_input subdirectory. This stops make program on OpenIndiana 11 gagging immediately in a UTF-8 locale. * tp/tests/run_parser_all.sh: Pass -I built_input to texi2any.
Date: Mon, 09 Jan 2023 16:23:53 -0500

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch release/7.0
in repository texinfo.

The following commit(s) were added to refs/heads/release/7.0 by this push:
     new cc551e94bf * tp/tests/Makefile.am: Call 
maintain/copy_change_file_name_encoding.pl to create files in built_input 
subdirectory.  This stops make program on OpenIndiana 11 gagging immediately in 
a UTF-8 locale. * tp/tests/run_parser_all.sh: Pass -I built_input to texi2any.
cc551e94bf is described below

commit cc551e94bfc05d9498f4edf40b17647bcee5051b
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jan 9 21:18:57 2023 +0000

    * tp/tests/Makefile.am:
    Call maintain/copy_change_file_name_encoding.pl to create files
    in built_input subdirectory.  This stops make program on
    OpenIndiana 11 gagging immediately in a UTF-8 locale.
    * tp/tests/run_parser_all.sh: Pass -I built_input to texi2any.
---
 .gitignore                 |  2 +-
 ChangeLog                  | 13 +++++++++++++
 tp/tests/Makefile.am       |  4 ++--
 tp/tests/run_parser_all.sh |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87e51f9326..25bee5c310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -218,7 +218,7 @@ tp/tests/*.trs
 tp/tests/test_scripts/*.log
 tp/tests/test_scripts/*.trs
 tp/tests/input_file_names_recoded_stamp.txt
-tp/tests/included_lat*n1.texi
+tp/tests/built_input
 
 tp/tests/many_input_files/different_encodings
 tp/tests/many_input_files/different_languages_gen_master_menu
diff --git a/ChangeLog b/ChangeLog
index 7ac9fe867b..ecb94e3b2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2023-01-04  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/tests/Makefile.am:
+       Call maintain/copy_change_file_name_encoding.pl to create files
+       in built_input subdirectory.  This stops make program on
+       OpenIndiana 11 gagging immediately in a UTF-8 locale.
+       * tp/tests/run_parser_all.sh: Pass -I built_input to texi2any.
+
+2023-01-04  Patrice Dumas  <pertusus@free.fr>
+
+       * .gitignore: replace tp/tests/included_lat*n1.texi by
+       tp/tests/built_input.
+
 2023-01-02  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * info/man.c (check_manpage_node):
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index 1973cacd0d..7b895d5f60 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -64,10 +64,10 @@ other-checks: all
 check_DATA = input_file_names_recoded_stamp.txt
 
 input_file_names_recoded_stamp.txt: $(srcdir)/input/included_latin1.texi
-       if $(PERL) $(srcdir)/../maintain/copy_change_file_name_encoding.pl 
$(srcdir)/input/included_latin1.texi . ; then echo 'OK' > $@ ; else echo 
'FAILED' > $@ ; fi
+       mkdir -p built_input ; if $(PERL) 
$(srcdir)/../maintain/copy_change_file_name_encoding.pl 
$(srcdir)/input/included_latin1.texi built_input ; then echo 'OK' > $@ ; else 
echo 'FAILED' > $@ ; fi
 
 distclean-local:
-       rm -f input_file_names_recoded_stamp.txt included_lat*n1.texi
+       rm -rf input_file_names_recoded_stamp.txt built_input
 
 EXTRA_DIST = run_parser_all.sh parser_tests.sh \
  $(one_test_files_generated_list) coverage_macro.texi included_akçentêd.texi \
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index f29fad4fe2..9ac401643f 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -399,7 +399,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 --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"
+    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 . -I built_input 
--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=$?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]