[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Gavin D. Smith |
|
Date: |
Fri, 15 Nov 2024 17:19:16 -0500 (EST) |
branch: master
commit d3b80493d467e445fff22ad60098a02f30897e2e
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Nov 15 22:00:53 2024 +0000
* tp/tests/input/non_ascii: New directory to centralise location
of files with non-ASCII names
* tp/tests/run_parser_all.sh: specify -I $srcdir/input/non_ascii
on texi2any command line
---
ChangeLog | 8 ++++++++
tp/tests/Makefile.am | 13 ++++++++++++-
tp/tests/encoded/Makefile.am | 3 +--
tp/tests/encoded/list-of-tests | 14 +++++++-------
.../tests/input/non_ascii/an_\303\257mage.png" | Bin
.../tests/input/non_ascii/c\303\252ss.css" | 0
.../input/non_ascii/included_ak\303\247ent\303\252d.texi" | 0
.../tests/input/non_ascii/os\303\251_utf8.texi" | 0
.../input/non_ascii/os\303\251_utf8_no_setfilename.texi" | 0
.../tests/input/non_ascii/txt_\303\247image.txt" | 0
.../tests/input/non_ascii/\303\247ss.css" | 0
tp/tests/run_parser_all.sh | 2 +-
12 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0c243d3b48..f6dc882ade 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/input/non_ascii: New directory to centralise location
+ of files with non-ASCII names
+
+ * tp/tests/run_parser_all.sh: specify -I $srcdir/input/non_ascii
+ on texi2any command line
+
2024-11-15 Gavin Smith <gavinsmith0123@gmail.com>
* tp/tests/many_input_files/Makefile.am:
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index 422b6335fb..fd8bf87e27 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -73,5 +73,16 @@ distclean-local:
rm -rf input_file_names_recoded_stamp.txt built_input
EXTRA_DIST = run_parser_all.sh parser_tests.sh escape_file_names.pl \
- $(one_test_files_generated_list) coverage_macro.texi included_akçentêd.texi \
+ $(one_test_files_generated_list) coverage_macro.texi \
input/included_latin1.texi
+
+# Files with non-ASCII file names
+na=input/non_ascii
+EXTRA_DIST += \
+ $(na)/osé_utf8.texi \
+ $(na)/osé_utf8_no_setfilename.texi \
+ $(na)/çss.css \
+ $(na)/cêss.css \
+ $(na)/an_ïmage.png \
+ $(na)/txt_çimage.txt \
+ $(na)/included_akçentêd.texi
diff --git a/tp/tests/encoded/Makefile.am b/tp/tests/encoded/Makefile.am
index e001efca60..54f7bb3db9 100644
--- a/tp/tests/encoded/Makefile.am
+++ b/tp/tests/encoded/Makefile.am
@@ -1,9 +1,8 @@
EXTRA_DIST = \
- osé_utf8.texi osé_utf8_no_setfilename.texi \
manual_include_accented_file_name_latin1.texi \
test_latin1_no_documentencoding.texi \
verbatiminclude_names_latin1.texi \
- çss.css cêss.css an_ïmage.png txt_çimage.txt list-of-tests res_parser
+ list-of-tests res_parser
DISTCLEANFILES = tests.log tests.out
diff --git a/tp/tests/encoded/list-of-tests b/tp/tests/encoded/list-of-tests
index 70ff0005ce..61bb047c58 100644
--- a/tp/tests/encoded/list-of-tests
+++ b/tp/tests/encoded/list-of-tests
@@ -18,23 +18,23 @@
# for all the tests.
# check non ascii in verbatiminclude file name
-#no_command_line_encoding osé_utf8.texi --html
+#no_command_line_encoding ../input/non_ascii/osé_utf8.texi --html
# check non ascii command line arguments and css files
-non_ascii_command_line 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 --css-ref=öref
+non_ascii_command_line ../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 --c [...]
# test for the copying of image with non ascii characters for epub
-non_ascii_test_epub 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'
+non_ascii_test_epub ../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'
# check that the output is right when based on @setfilename
-non_ascii_test_rawtext 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
+non_ascii_test_rawtext ../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
# check that the output is right when based on input file name
-non_ascii_no_setfilename_test_rawtext 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
+non_ascii_no_setfilename_test_rawtext
../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
-non_ascii_test_info 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
+non_ascii_test_info ../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
-non_ascii_test_latex 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
+non_ascii_test_latex ../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
# 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/encoded/an_\303\257mage.png"
"b/tp/tests/input/non_ascii/an_\303\257mage.png"
similarity index 100%
rename from "tp/tests/encoded/an_\303\257mage.png"
rename to "tp/tests/input/non_ascii/an_\303\257mage.png"
diff --git "a/tp/tests/encoded/c\303\252ss.css"
"b/tp/tests/input/non_ascii/c\303\252ss.css"
similarity index 100%
rename from "tp/tests/encoded/c\303\252ss.css"
rename to "tp/tests/input/non_ascii/c\303\252ss.css"
diff --git "a/tp/tests/included_ak\303\247ent\303\252d.texi"
"b/tp/tests/input/non_ascii/included_ak\303\247ent\303\252d.texi"
similarity index 100%
rename from "tp/tests/included_ak\303\247ent\303\252d.texi"
rename to "tp/tests/input/non_ascii/included_ak\303\247ent\303\252d.texi"
diff --git "a/tp/tests/encoded/os\303\251_utf8.texi"
"b/tp/tests/input/non_ascii/os\303\251_utf8.texi"
similarity index 100%
rename from "tp/tests/encoded/os\303\251_utf8.texi"
rename to "tp/tests/input/non_ascii/os\303\251_utf8.texi"
diff --git "a/tp/tests/encoded/os\303\251_utf8_no_setfilename.texi"
"b/tp/tests/input/non_ascii/os\303\251_utf8_no_setfilename.texi"
similarity index 100%
rename from "tp/tests/encoded/os\303\251_utf8_no_setfilename.texi"
rename to "tp/tests/input/non_ascii/os\303\251_utf8_no_setfilename.texi"
diff --git "a/tp/tests/encoded/txt_\303\247image.txt"
"b/tp/tests/input/non_ascii/txt_\303\247image.txt"
similarity index 100%
rename from "tp/tests/encoded/txt_\303\247image.txt"
rename to "tp/tests/input/non_ascii/txt_\303\247image.txt"
diff --git "a/tp/tests/encoded/\303\247ss.css"
"b/tp/tests/input/non_ascii/\303\247ss.css"
similarity index 100%
rename from "tp/tests/encoded/\303\247ss.css"
rename to "tp/tests/input/non_ascii/\303\247ss.css"
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index f5c4f0be7a..689d5a4cc8 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -431,7 +431,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 . -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"
+ 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
-I $srcdir/input/non_ascii --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=$?