[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Gavin D. Smith |
|
Date: |
Sun, 17 Nov 2024 12:17:55 -0500 (EST) |
branch: master
commit e29f9ad458874766857cec3563160ce78dd7965a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Nov 17 17:17:45 2024 +0000
Remove "command-line Unicode" condition for tests
* tp/tests/encoded/list-of-tests: remove setting
-D 'needcommandlineunicode Need command-line unicode'
* tp/tests/run_parser_all.sh (check_need_command_line_unicode):
Remove, as it is superfluous with the non-ASCII file names condition
for tests which is now used with all of the affected tests.
* tp/tests/Makefile.am: comment moved from run_parser_all.sh.
* tp/tests/many_input_files/output_dir_file_non_ascii.sh,
* tp/tests/many_input_files/output_dir_non_ascii.sh,
* tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh,
* tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh:
Remove ad-hoc code checking HOST_IS_WINDOWS.
---
ChangeLog | 18 ++++++++++++++++++
tp/tests/Makefile.am | 10 ++++++++++
tp/tests/encoded/list-of-tests | 12 ++++++------
.../many_input_files/output_dir_file_non_ascii.sh | 5 -----
tp/tests/many_input_files/output_dir_non_ascii.sh | 5 -----
.../many_input_files/tex_l2h_output_dir_non_ascii.sh | 5 -----
.../many_input_files/tex_t4ht_output_dir_non_ascii.sh | 5 -----
tp/tests/run_parser_all.sh | 19 -------------------
8 files changed, 34 insertions(+), 45 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ee2e105964..9c5efcdc92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2024-11-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove "command-line Unicode" condition for tests
+
+ * tp/tests/encoded/list-of-tests: remove setting
+ -D 'needcommandlineunicode Need command-line unicode'
+
+ * tp/tests/run_parser_all.sh (check_need_command_line_unicode):
+ Remove, as it is superfluous with the non-ASCII file names condition
+ for tests which is now used with all of the affected tests.
+ * tp/tests/Makefile.am: comment moved from run_parser_all.sh.
+
+ * tp/tests/many_input_files/output_dir_file_non_ascii.sh,
+ * tp/tests/many_input_files/output_dir_non_ascii.sh,
+ * tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh,
+ * tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh:
+ Remove ad-hoc code checking HOST_IS_WINDOWS.
+
2024-11-17 Gavin Smith <gavinsmith0123@gmail.com>
Skip tests for non-ASCII file names
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index d2abf13956..034c622546 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -107,6 +107,16 @@ else
non_ascii_extracted_stamp.txt:
echo FAIL > non_ascii_extracted_stamp.txt
endif
+# We skip some tests if we don't extract the non-ASCII input files.
+# This avoid issues with the creation of such files on MS-Windows.
+# This also avoids use by tests of non-ASCII characters on command lines
+# using UTF-8 to encode those characters in the source files.
+# Shell on Windows may consider those characters to be
+# encoded in the current codeset, passing them incorrectly to
+# the programs, and even if the shell passed them unchanged, native
+# Windows perl in most cases cannot cope with non-ASCII arguments
+# encoded in a different encoding than the current user codepage.
+
# tar m discards file modification dates from the archive.
diff --git a/tp/tests/encoded/list-of-tests b/tp/tests/encoded/list-of-tests
index 94166bea44..b8748b3090 100644
--- a/tp/tests/encoded/list-of-tests
+++ b/tp/tests/encoded/list-of-tests
@@ -21,20 +21,20 @@
#no_command_line_encoding built_input/non_ascii/osé_utf8.texi --html -D
'neednonasciifilenames Need non-ASCII file names'
# check non ascii command line arguments and css files
-non_ascii_command_line built_input/non_ascii/osé_utf8.texi -D
'needcommandlineunicode Need command-line unicode' --html --no-split -c
DO_ABOUT=1 -c COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 --split=Mekanïk --document-language=Destruktïw
-c 'Kommandöh vâl' -D TÛT -D 'vùr ké' -U ôndef -c 'FORMAT_MENU mînù'
--macro-expand=@OUT_DIR@osé-texinfo.texi --internal-links=@OUT_DIR@intérnal.txt
--css-include çss.css --css-include cêss.css --css-ref=rëf [...]
+non_ascii_command_line built_input/non_ascii/osé_utf8.texi --html --no-split
-c DO_ABOUT=1 -c COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 --split=Mekanïk --document-language=Destruktïw
-c 'Kommandöh vâl' -D TÛT -D 'vùr ké' -U ôndef -c 'FORMAT_MENU mînù'
--macro-expand=@OUT_DIR@osé-texinfo.texi --internal-links=@OUT_DIR@intérnal.txt
--css-include çss.css --css-include cêss.css --css-ref=rëf --css-ref=öref -D
'neednonasciifilenames Need non-ASCI [...]
# test for the copying of image with non ascii characters for epub
-non_ascii_test_epub built_input/non_ascii/osé_utf8.texi -D
'needcommandlineunicode Need command-line unicode' -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 --init epub3.pm -c 'EPUB_CREATE_CONTAINER_FILE
0' -D 'neednonasciifilenames Need non-ASCII file names'
+non_ascii_test_epub built_input/non_ascii/osé_utf8.texi -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 --init epub3.pm -c 'EPUB_CREATE_CONTAINER_FILE
0' -D 'neednonasciifilenames Need non-ASCII file names'
# check that the output is right when based on @setfilename
-non_ascii_test_rawtext built_input/non_ascii/osé_utf8.texi -D
'needcommandlineunicode Need command-line unicode' -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 -c
TEXINFO_OUTPUT_FORMAT=rawtext -D 'neednonasciifilenames Need non-ASCII file
names'
+non_ascii_test_rawtext built_input/non_ascii/osé_utf8.texi -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 -c
TEXINFO_OUTPUT_FORMAT=rawtext -D 'neednonasciifilenames Need non-ASCII file
names'
# check that the output is right when based on input file name
-non_ascii_no_setfilename_test_rawtext
built_input/non_ascii/osé_utf8_no_setfilename.texi -D 'needcommandlineunicode
Need command-line unicode' -c COMMAND_LINE_ENCODING=UTF-8 -c
MESSAGE_ENCODING=UTF-8 -c OUTPUT_FILE_NAME_ENCODING=UTF-8 -c
INPUT_FILE_NAME_ENCODING=UTF-8 -c TEXINFO_OUTPUT_FORMAT=rawtext -D
'neednonasciifilenames Need non-ASCII file names'
+non_ascii_no_setfilename_test_rawtext
built_input/non_ascii/osé_utf8_no_setfilename.texi -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 -c
TEXINFO_OUTPUT_FORMAT=rawtext -D 'neednonasciifilenames Need non-ASCII file
names'
-non_ascii_test_info built_input/non_ascii/osé_utf8.texi -D
'needcommandlineunicode Need command-line unicode' -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 --info -D
'neednonasciifilenames Need non-ASCII file names'
+non_ascii_test_info built_input/non_ascii/osé_utf8.texi -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 --info -D
'neednonasciifilenames Need non-ASCII file names'
-non_ascii_test_latex built_input/non_ascii/osé_utf8.texi -D
'needcommandlineunicode Need command-line unicode' -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 --latex -D
'neednonasciifilenames Need non-ASCII file names'
+non_ascii_test_latex built_input/non_ascii/osé_utf8.texi -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 --latex -D
'neednonasciifilenames Need non-ASCII file names'
# test of non utf8 encoded file name in non utf8 document
# "Need recoded file names" string is used in test driving script
diff --git a/tp/tests/many_input_files/output_dir_file_non_ascii.sh
b/tp/tests/many_input_files/output_dir_file_non_ascii.sh
index f79fa96e8b..8abb1d4495 100755
--- a/tp/tests/many_input_files/output_dir_file_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_file_non_ascii.sh
@@ -33,11 +33,6 @@ else
exit 77
fi
-# Need command-line unicode for this test, which is not reliable on Windows
-if test "z$HOST_IS_WINDOWS_VARIABLE" = 'zyes' ; then
- exit 77
-fi
-
[ -d $diffs_dir ] || mkdir $diffs_dir
staging_dir=$diffs_dir/staging
[ -d $staging_dir ] || mkdir $staging_dir
diff --git a/tp/tests/many_input_files/output_dir_non_ascii.sh
b/tp/tests/many_input_files/output_dir_non_ascii.sh
index 0ad3148089..a1df131992 100755
--- a/tp/tests/many_input_files/output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_non_ascii.sh
@@ -33,11 +33,6 @@ else
exit 77
fi
-# Need command-line unicode for this test, which is not reliable on Windows
-if test "z$HOST_IS_WINDOWS_VARIABLE" = 'zyes' ; then
- exit 77
-fi
-
[ -d $diffs_dir ] || mkdir $diffs_dir
staging_dir=$diffs_dir/staging
[ -d $staging_dir ] || mkdir $staging_dir
diff --git a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
index 7c6dd1dedf..caf662e2dc 100755
--- a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
@@ -44,11 +44,6 @@ else
exit 77
fi
-# Need command-line unicode for this test, which is not reliable on Windows
-if test "z$HOST_IS_WINDOWS_VARIABLE" = 'zyes' ; then
- exit 77
-fi
-
[ -d $diffs_dir ] || mkdir $diffs_dir
staging_dir=$diffs_dir/staging
[ -d $staging_dir ] || mkdir $staging_dir
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 83224f7264..dbbbb82874 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
@@ -32,11 +32,6 @@ else
exit 77
fi
-# Need command-line unicode for this test, which is not reliable on Windows
-if test "z$HOST_IS_WINDOWS_VARIABLE" = 'zyes' ; then
- exit 77
-fi
-
[ -d $diffs_dir ] || mkdir $diffs_dir
staging_dir=$diffs_dir/staging
[ -d $staging_dir ] || mkdir $staging_dir
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index db0d10633c..304f5e1dcb 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -29,24 +29,6 @@ check_need_non_ascii_file_names ()
return 0
}
-# Some tests use non-ASCII characters on their command line,
-# using UTF-8 to encode those characters in the source files.
-# Shell on Windows may consider those characters to be
-# encoded in the current codeset, passing them incorrectly to
-# the programs, and even if the shell passed them unchanged, native
-# Windows perl in most cases cannot cope with non-ASCII arguments
-# encoded in a different encoding than the current user codepage.
-check_need_command_line_unicode ()
-{
- if echo "$remaining" | grep 'Need command-line unicode' >/dev/null; then
- if test "z$HOST_IS_WINDOWS_VARIABLE" = 'zyes' ; then
- echo "S: (no reliable command-line Unicode) $current"
- return 1
- fi
- fi
- return 0
-}
-
check_unicode_collate_ok ()
{
if echo "$remaining" | grep 'Need collation compatibility' >/dev/null; then
@@ -436,7 +418,6 @@ while read line; do
skipped_test=no
check_need_recoded_file_names || skipped_test=yes
check_need_non_ascii_file_names || skipped_test=yes
- check_need_command_line_unicode || skipped_test=yes
check_latex2html_and_tex4ht || skipped_test=yes
check_unicode_collate_ok || skipped_test=yes
check_strxfrm_ok || skipped_test=yes