[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Mon, 6 Feb 2023 17:28:03 -0500 (EST) |
branch: master
commit 29172c0852d7bf21ed3cfba9648f6f5a0908c49b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Feb 6 23:25:51 2023 +0100
* tp/tests/many_input_files/*.sh: use a variable for the command
run to avoid redundant code.
---
ChangeLog | 5 +++++
tp/tests/many_input_files/different_encodings.sh | 6 ++++--
tp/tests/many_input_files/different_languages_gen_master_menu.sh | 5 +++--
tp/tests/many_input_files/input_dir_non_ascii.sh | 5 +++--
tp/tests/many_input_files/output_dir_file_non_ascii.sh | 5 +++--
tp/tests/many_input_files/output_dir_non_ascii.sh | 5 +++--
tp/tests/many_input_files/tex_l2h.sh | 5 +++--
tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh | 5 +++--
tp/tests/many_input_files/tex_t4ht.sh | 5 +++--
tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh | 5 +++--
10 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fdf2f9d0c0..a2ad1b0faa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-06 Patrice Dumas <pertusus@free.fr>
+
+ * tp/tests/many_input_files/*.sh: use a variable for the command
+ run to avoid redundant code.
+
2023-02-06 Patrice Dumas <pertusus@free.fr>
* tp/tests/run_parser_all.sh: reindent a function.
diff --git a/tp/tests/many_input_files/different_encodings.sh
b/tp/tests/many_input_files/different_encodings.sh
index 3e185dccfa..84ed1ad029 100755
--- a/tp/tests/many_input_files/different_encodings.sh
+++ b/tp/tests/many_input_files/different_encodings.sh
@@ -36,8 +36,10 @@ raw_outdir=$raw_output_dir/$basename
[ -d $raw_outdir ] && rm -rf $raw_outdir
mkdir $basename
: > $basename/$stdout_file
-echo "$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding -c
OUTPUT_CHARACTERS=1 --conf-dir $srcdir/../../init --out $basename/
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi
$srcdir/../../t/input_files/char_latin1_utf8_in_refs.texi --force >> $basen
[...]
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding -c
OUTPUT_CHARACTERS=1 --conf-dir $srcdir/../../init --out $basename/
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi
$srcdir/../../t/input_files/char_latin1_utf8_in_refs.texi --force >>
$basename/$s [...]
+set -x
+cmd="$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding -c
OUTPUT_CHARACTERS=1 --conf-dir $srcdir/../../init --out $basename/
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi
$srcdir/../../t/input_files/char_latin1_utf8_in_refs.texi --force >> $basena
[...]
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?
diff --git a/tp/tests/many_input_files/different_languages_gen_master_menu.sh
b/tp/tests/many_input_files/different_languages_gen_master_menu.sh
index 36a5c57051..4b3f07e038 100755
--- a/tp/tests/many_input_files/different_languages_gen_master_menu.sh
+++ b/tp/tests/many_input_files/different_languages_gen_master_menu.sh
@@ -36,8 +36,9 @@ raw_outdir=$raw_output_dir/$basename
[ -d $raw_outdir ] && rm -rf $raw_outdir
mkdir $basename
: > $basename/$stdout_file
-echo "$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split -c FORMAT_MENU=menu -c
TREE_TRANSFORMATIONS=regenerate_master_menu --set-customization-variable 'TEST
1' --conf-dir $srcdir/../../init --out $basename/
$srcdir/input_files/no_master_menu_fr.texi
$srcdir/input_files/no_master_menu_pt.texi --force >> $basename/$s [...]
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split -c FORMAT_MENU=menu -c
TREE_TRANSFORMATIONS=regenerate_master_menu --set-customization-variable 'TEST
1' --conf-dir $srcdir/../../init --out $basename/
$srcdir/input_files/no_master_menu_fr.texi
$srcdir/input_files/no_master_menu_no_documentlanguage.texi --force >> $ [...]
+cmd="$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split -c FORMAT_MENU=menu -c
TREE_TRANSFORMATIONS=regenerate_master_menu --set-customization-variable 'TEST
1' --conf-dir $srcdir/../../init --out $basename/
$srcdir/input_files/no_master_menu_fr.texi
$srcdir/input_files/no_master_menu_no_documentlanguage.texi --force [...]
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?
diff --git a/tp/tests/many_input_files/input_dir_non_ascii.sh
b/tp/tests/many_input_files/input_dir_non_ascii.sh
index 378db875b2..c47a3f7fcf 100755
--- a/tp/tests/many_input_files/input_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/input_dir_non_ascii.sh
@@ -43,8 +43,9 @@ raw_outdir=$raw_output_dir/$basename
mkdir $basename
: > $basename/$stdout_file
-echo "$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' -I
$srcdir/input_files/dir_înclùde --conf-dir $srcdir/../../init --out $basename/
$srcdir/input_files/simple_including_file.texi --force >>
$basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' -I
$srcdir/input_files/dir_înclùde --conf-dir $srcdir/../../init --out $basename/
$srcdir/input_files/simple_including_file.texi --force >>
$basename/$stdout_file 2>$basename/${basename}.2
+cmd="$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' -I
$srcdir/input_files/dir_înclùde --conf-dir $srcdir/../../init --out $basename/
$srcdir/input_files/simple_including_file.texi --force >>
$basename/$stdout_file 2>$basename/${basename}.2"
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?
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 e9ed159fc2..e164dd028f 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
@@ -45,8 +45,9 @@ 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 -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2
+cmd="$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2"
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?
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 7bc4ab84ea..f5748ebb35 100755
--- a/tp/tests/many_input_files/output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_non_ascii.sh
@@ -45,8 +45,9 @@ 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 -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2
+cmd="$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2"
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?
diff --git a/tp/tests/many_input_files/tex_l2h.sh
b/tp/tests/many_input_files/tex_l2h.sh
index 1c448d8c82..5b851884b2 100755
--- a/tp/tests/many_input_files/tex_l2h.sh
+++ b/tp/tests/many_input_files/tex_l2h.sh
@@ -53,8 +53,9 @@ raw_outdir=$raw_output_dir/$basename
[ -d $raw_outdir ] && rm -rf $raw_outdir
mkdir $basename
: > $basename/$stdout_file
-echo "$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-cus [...]
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-customiz [...]
+cmd="$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-cust [...]
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?
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 afe0aaf1ab..881f469ac4 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
@@ -62,8 +62,9 @@ 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 -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-cu [...]
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-customiz [...]
+cmd="$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-cus [...]
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?
diff --git a/tp/tests/many_input_files/tex_t4ht.sh
b/tp/tests/many_input_files/tex_t4ht.sh
index 80028bd467..db1082ffcc 100755
--- a/tp/tests/many_input_files/tex_t4ht.sh
+++ b/tp/tests/many_input_files/tex_t4ht.sh
@@ -35,8 +35,9 @@ 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/../../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
+cmd="$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"
+echo "$cmd" >> $logfile
+eval $cmd
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 08f0b380f2..f2703e9bb0 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
@@ -44,8 +44,9 @@ 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/../../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
+cmd="$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"
+echo "$cmd" >> $logfile
+eval $cmd
return_code=0
ret=$?