branch master updated: * tp/tests/Makefile.am (check_DATA): copy and change file name encoding from utf8 to latin1 for latin1 encoded file name for tests.

[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 72f794949c * tp/tests/Makefile.am (check_DATA): copy and change file 
name encoding from utf8 to latin1 for latin1 encoded file name for tests.
72f794949c is described below

commit 72f794949c0183f4e8af19f5ac3b788c35235edf
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Mar 10 04:25:00 2022 +0100

    * tp/tests/Makefile.am (check_DATA): copy and change file name
    encoding from utf8 to latin1 for latin1 encoded file name for tests.
---
 .gitignore                                                     |  4 ++--
 ChangeLog                                                      |  5 +++++
 tp/tests/Makefile.am                                           |  7 +++++--
 tp/tests/formatting/Makefile.am                                |  1 +
 tp/tests/formatting/list-of-tests                              |  9 +++++++++
 .../manual_include_accented_file_name_latin1.texi              |  0
 .../manual_include_accented_file_name_latin1.1                 |  0
 .../manual_include_accented_file_name_latin1.2                 |  0
 .../manual_include_accented_file_name_latin1.info              |  0
 .../manual_include_accented_file_name_latin1.1                 |  0
 .../manual_include_accented_file_name_latin1.2                 |  0
 .../manual_include_accented_file_name_latin1.info              |  0
 .../manual_include_accented_file_name_latin1.1                 |  0
 .../manual_include_accented_file_name_latin1.2                 |  0
 .../manual_include_accented_file_name_latin1.info              |  0
 tp/tests/other/list-of-tests                                   | 10 ----------
 ... => formatting_manual_include_accented_file_name_latin1.sh} |  8 +-------
 ...ual_include_accented_file_name_latin1_explicit_encoding.sh} |  8 +-------
 ...l_include_accented_file_name_latin1_use_locale_encoding.sh} |  8 +-------
 19 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee21815143..7beec97a9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -203,10 +203,10 @@ tp/tests/*/test_log
 
 tp/tests/*.log
 tp/tests/*.trs
-tp/tests/t/*.log
-tp/tests/t/*.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/many_input_files/different_encodings
 tp/tests/many_input_files/different_languages_gen_master_menu
diff --git a/ChangeLog b/ChangeLog
index eafafa8682..cebf9f0454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-03-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/tests/Makefile.am (check_DATA): copy and change file name
+       encoding from utf8 to latin1 for latin1 encoded file name for tests.
+
 2022-03-10  Patrice Dumas  <pertusus@free.fr>
 
        Add NO_TOP_NODE_OUTPUT to discard Top node for "book like" styles
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index 2677bd1d69..9d2cf011d1 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -61,8 +61,11 @@ tex-html-checks tex-html-check: all
 other-checks: all
        $(MAKE) $(AM_MAKEFLAGS) check OTHER_TESTS=yes 
TESTS='$(type_other_one_test_files_generated_list)' SUBDIRS=
 
-#check-local:
-#      $(PERL) $(srcdir)/maintain/copy_change_file_name_encoding.pl 
$(serdir)/input/included_latîn1.texi .
+check_DATA = input_file_names_recoded_stamp.txt
+
+input_file_names_recoded_stamp.txt: $(srcdir)/input/included_latîn1.texi
+       $(PERL) $(srcdir)/../maintain/copy_change_file_name_encoding.pl 
$(srcdir)/input/included_latîn1.texi .
+       : > $@
 
 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/formatting/Makefile.am b/tp/tests/formatting/Makefile.am
index 2d44ab7285..03fae2d99f 100644
--- a/tp/tests/formatting/Makefile.am
+++ b/tp/tests/formatting/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = \
  inc_file.texi              test_need.texi \
  lightweight_markups.texi   japanese_long_name.texi  \
  osé_utf8.texi osé_utf8_no_setfilename.texi \
+ manual_include_accented_file_name_latin1.texi \
  çss.css cêss.css file.css an_ïmage.png list-of-tests  res_parser
 
 DISTCLEANFILES = tests.log tests.out
diff --git a/tp/tests/formatting/list-of-tests 
b/tp/tests/formatting/list-of-tests
index ff96179427..675768a0cc 100644
--- a/tp/tests/formatting/list-of-tests
+++ b/tp/tests/formatting/list-of-tests
@@ -30,3 +30,12 @@ non_ascii_test_rawtext osé_utf8.texi -c 
TEXINFO_OUTPUT_FORMAT=rawtext
 # check that the output is right when based on input file name
 non_ascii_no_setfilename_test_rawtext osé_utf8_no_setfilename.texi -c 
TEXINFO_OUTPUT_FORMAT=rawtext
 
+# test of non utf8 encoded file name in non utf8 document
+manual_include_accented_file_name_latin1 
manual_include_accented_file_name_latin1.texi --info
+
+manual_include_accented_file_name_latin1_explicit_encoding 
manual_include_accented_file_name_latin1.texi --info -c 
DOC_ENCODING_FOR_INPUT_FILE_NAME=0 -c LOCALE_INPUT_FILE_NAME_ENCODING=ISO-8859-1
+
+# fails to find the latin1 encoded include file as the locale encoding
+# of the test suite is utf8
+manual_include_accented_file_name_latin1_use_locale_encoding 
manual_include_accented_file_name_latin1.texi --info -c 
DOC_ENCODING_FOR_INPUT_FILE_NAME=0
+
diff --git a/tp/tests/other/manual_include_accented_file_name_latin1.texi 
b/tp/tests/formatting/manual_include_accented_file_name_latin1.texi
similarity index 100%
rename from tp/tests/other/manual_include_accented_file_name_latin1.texi
rename to tp/tests/formatting/manual_include_accented_file_name_latin1.texi
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
diff --git 
a/tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
 
b/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
similarity index 100%
rename from 
tp/tests/other/res_parser_html/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
rename to 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
diff --git a/tp/tests/other/list-of-tests b/tp/tests/other/list-of-tests
index e96bb17a3e..b3a23008f1 100644
--- a/tp/tests/other/list-of-tests
+++ b/tp/tests/other/list-of-tests
@@ -1,13 +1,3 @@
 # formats :_html
 
 highlight_syntax_example highlight_example.texi --html 
--init=highlight_syntax.pm
-
-# test of non utf8 encoded file name in non utf8 document
-# FIXME here because the included file can not be in dist
-manual_include_accented_file_name_latin1 
manual_include_accented_file_name_latin1.texi --info
-
-manual_include_accented_file_name_latin1_explicit_encoding 
manual_include_accented_file_name_latin1.texi --info -c 
DOC_ENCODING_FOR_INPUT_FILE_NAME=0 -c LOCALE_INPUT_FILE_NAME_ENCODING=ISO-8859-1
-
-# fails to find the latin1 encoded include file as the locale encoding
-# of the test suite is utf8
-manual_include_accented_file_name_latin1_use_locale_encoding 
manual_include_accented_file_name_latin1.texi --info -c 
DOC_ENCODING_FOR_INPUT_FILE_NAME=0
diff --git 
a/tp/tests/test_scripts/other_manual_include_accented_file_name_latin1.sh 
b/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1.sh
similarity index 71%
rename from 
tp/tests/test_scripts/other_manual_include_accented_file_name_latin1.sh
rename to 
tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1.sh
index 14b274c6fa..7c40daeb17 100755
--- a/tp/tests/test_scripts/other_manual_include_accented_file_name_latin1.sh
+++ 
b/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1.sh
@@ -8,13 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-
-if test "z$OTHER_TESTS" != z"yes"; then
-  echo "Skipping other tests that are not easily reproducible"
-  exit 77
-fi
-
-dir=other
+dir=formatting
 name='manual_include_accented_file_name_latin1'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/other_manual_include_accented_file_name_latin1_explicit_encoding.sh
 
b/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_explicit_encoding.sh
similarity index 72%
rename from 
tp/tests/test_scripts/other_manual_include_accented_file_name_latin1_explicit_encoding.sh
rename to 
tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_explicit_encoding.sh
index 581d7d0dfa..afce91ff5b 100755
--- 
a/tp/tests/test_scripts/other_manual_include_accented_file_name_latin1_explicit_encoding.sh
+++ 
b/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_explicit_encoding.sh
@@ -8,13 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-
-if test "z$OTHER_TESTS" != z"yes"; then
-  echo "Skipping other tests that are not easily reproducible"
-  exit 77
-fi
-
-dir=other
+dir=formatting
 name='manual_include_accented_file_name_latin1_explicit_encoding'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/other_manual_include_accented_file_name_latin1_use_locale_encoding.sh
 
b/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_use_locale_encoding.sh
similarity index 72%
rename from 
tp/tests/test_scripts/other_manual_include_accented_file_name_latin1_use_locale_encoding.sh
rename to 
tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_use_locale_encoding.sh
index 43241dae99..555db4f5ee 100755
--- 
a/tp/tests/test_scripts/other_manual_include_accented_file_name_latin1_use_locale_encoding.sh
+++ 
b/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_use_locale_encoding.sh
@@ -8,13 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-
-if test "z$OTHER_TESTS" != z"yes"; then
-  echo "Skipping other tests that are not easily reproducible"
-  exit 77
-fi
-
-dir=other
+dir=formatting
 name='manual_include_accented_file_name_latin1_use_locale_encoding'
 mkdir -p $dir