diff options
author | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-03-29 12:18:50 +0000 |
---|---|---|
committer | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-03-29 12:18:50 +0000 |
commit | aa0e5e6217c1d825b338e4f04b75a273a953520b (patch) | |
tree | 3803917518a6047ebb1e9b867a6b9f3b1264d132 /Build/source/texk | |
parent | 578ea679c188fe248af9423bc350927353585fa5 (diff) |
(e)(u)ptex: skip tests for Shift_JIS/EUC-JP if conversion failed
git-svn-id: svn://tug.org/texlive/trunk@66702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/eptexdir/ChangeLog | 7 | ||||
-rwxr-xr-x | Build/source/texk/web2c/eptexdir/wcfname.test | 23 | ||||
-rw-r--r-- | Build/source/texk/web2c/euptexdir/ChangeLog | 7 | ||||
-rwxr-xr-x | Build/source/texk/web2c/euptexdir/wcfname.test | 22 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/web2c/pdftexdir/wcfname.test | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ChangeLog | 7 | ||||
-rwxr-xr-x | Build/source/texk/web2c/ptexdir/wcfname.test | 23 | ||||
-rwxr-xr-x | Build/source/texk/web2c/tests/fn-generate.perl | 12 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/ChangeLog | 7 | ||||
-rwxr-xr-x | Build/source/texk/web2c/uptexdir/wcfname.test | 22 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/web2c/xetexdir/wcfname.test | 8 |
14 files changed, 138 insertions, 25 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index bda62667c65..a341eb42d74 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * tests/fn-generate.perl: + Skip tests for Shift_JIS & EUC-JP if conversion failed. + Report from Ken Moffat. + https://tug.org/pipermail/tex-k/2023-March/003911.html + 2023-02-14 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * tests/fn-generate.perl: diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index cb1fd02415a..08807a1ed5e 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,10 @@ +2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * wcfname.test: + Skip tests for Shift_JIS & EUC-JP if conversion failed. + Report from Ken Moffat. + https://tug.org/pipermail/tex-k/2023-March/003911.html + 2023-03-09 Karl Berry <karl@tug.org> * TL'23 release. diff --git a/Build/source/texk/web2c/eptexdir/wcfname.test b/Build/source/texk/web2c/eptexdir/wcfname.test index 9fb213a653b..7555df69310 100755 --- a/Build/source/texk/web2c/eptexdir/wcfname.test +++ b/Build/source/texk/web2c/eptexdir/wcfname.test @@ -12,20 +12,28 @@ TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS=eptests:.; export TEXINPUTS for loc in C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8 ja_JP.UTF-8 ja_JP.utf8; do - locale -a | grep $loc + locale -a | grep "^$loc\$" ret=$? + # For Slackware linux, we need to replace from utf8 to UTF-8 + if [ -f /etc/slackware-version ]; then + loc=`echo $loc | sed -e "s/utf8/UTF-8/"` + fi if [ $ret = 0 ]; then LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE break fi done -if [ $ret = 1 ]; then +if [ $ret != 0 ]; then # linux musl fails to run `locale -a` but seems to have C.UTF-8 loc=C.UTF-8 LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE fi -perl $srcdir/tests/fn-generate.perl eptests || exit 128 +perl $srcdir/tests/fn-generate.perl eptests +pret=$? +if [ $pret != 0 ] && [ $pret != 239 ]; then + exit 128 +fi # pTeX internal encoding fenc="utf8" @@ -34,12 +42,17 @@ for doc in fn-$fenc fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./eptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >eptests/$doc-$ienc-term.log || rc=1 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex eptests/ + mv $doc-$ienc.txt $doc-$ienc.log eptests/ diff eptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=2 done done +if [ $pret = 239 ]; then + echo "*** skip tests for Shift_JIS & EUC-JP." + exit 0 +fi + # pTeX, regacy encoding for fenc in sjis euc; do @@ -56,7 +69,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./eptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >eptests/$doc-$fenc-term.log || rc=3 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex eptests/ + mv $doc-$ienc.txt $doc-$ienc.log eptests/ diff eptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=4 done diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 820b8262165..991a051add5 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,10 @@ +2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * wcfname.test: + Skip tests for Shift_JIS & EUC-JP if conversion failed. + Report from Ken Moffat. + https://tug.org/pipermail/tex-k/2023-March/003911.html + 2023-03-09 Karl Berry <karl@tug.org> * TL'23 release. diff --git a/Build/source/texk/web2c/euptexdir/wcfname.test b/Build/source/texk/web2c/euptexdir/wcfname.test index 7d670036f8a..a6952999edd 100755 --- a/Build/source/texk/web2c/euptexdir/wcfname.test +++ b/Build/source/texk/web2c/euptexdir/wcfname.test @@ -12,20 +12,27 @@ TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS=euptests:.; export TEXINPUTS for loc in C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8 ja_JP.UTF-8 ja_JP.utf8; do - locale -a | grep $loc + locale -a | grep "^$loc\$" ret=$? + if [ -f /etc/slackware-version ]; then + loc=`echo $loc | sed -e "s/utf8/UTF-8/"` + fi if [ $ret = 0 ]; then LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE break fi done -if [ $ret = 1 ]; then +if [ $ret != 0 ]; then # linux musl fails to run `locale -a` but seems to have C.UTF-8 loc=C.UTF-8 LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE fi -perl $srcdir/tests/fn-generate.perl euptests || exit 128 +perl $srcdir/tests/fn-generate.perl euptests +pret=$? +if [ $pret != 0 ] && [ $pret != 239 ]; then + exit 128 +fi # upTeX internal encoding fenc="utf8" @@ -49,12 +56,17 @@ for doc in fn-$fenc fnさざ波-$fenc fn£¥µÆÇñß-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./euptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >euptests/$doc-$ienc-term.log || rc=1 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex euptests/ + mv $doc-$ienc.txt $doc-$ienc.log euptests/ diff euptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=2 done done +if [ $pret = 239 ]; then + echo "*** skip tests for Shift_JIS & EUC-JP." + exit 0 +fi + # pTeX compatible mode, regacy encoding for fenc in sjis euc; do @@ -82,7 +94,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./euptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >euptests/$doc-$fenc-term.log || rc=3 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex euptests/ + mv $doc-$ienc.txt $doc-$ienc.log euptests/ diff euptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=4 done diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index f0cee819a92..2900824c637 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * wcfname.test: + Sync with update of fn-generate.perl. + 2023-03-09 Karl Berry <karl@tug.org> * TL'23 release. diff --git a/Build/source/texk/web2c/pdftexdir/wcfname.test b/Build/source/texk/web2c/pdftexdir/wcfname.test index ce77beda58e..b5c2a7802a6 100755 --- a/Build/source/texk/web2c/pdftexdir/wcfname.test +++ b/Build/source/texk/web2c/pdftexdir/wcfname.test @@ -11,7 +11,11 @@ rc=0 TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS=pdftests:.; export TEXINPUTS -perl $srcdir/tests/fn-generate.perl pdftests || exit 128 +perl $srcdir/tests/fn-generate.perl pdftests +pret=$? +if [ $pret != 0 ] && [ $pret != 239 ]; then + exit 128 +fi rm -f pdftests/fn*-euc.tex pdftests/fn*-sjis.tex if [ "$COMSPEC" != "" ]; then @@ -25,7 +29,7 @@ for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ./pdftex -ini -interaction nonstopmode -jobname=$doc --shell-escape $doc.tex >pdftests/$doc-term.log || rc=1 - mv $doc.txt $doc.log fn*-tmp.tex pdftests/ + mv $doc.txt $doc.log pdftests/ ## It does not work. ## diff pdftests/$doc.txt $srcdir/tests/fn-$enc.txt || rc=2 diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 6c56a2b041b..539efeb1bf3 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,10 @@ +2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * wcfname.test: + Skip tests for Shift_JIS & EUC-JP if conversion failed. + Report from Ken Moffat. + https://tug.org/pipermail/tex-k/2023-March/003911.html + 2023-03-09 Karl Berry <karl@tug.org> * TL'23 release. diff --git a/Build/source/texk/web2c/ptexdir/wcfname.test b/Build/source/texk/web2c/ptexdir/wcfname.test index 957de6f7154..734ee3dd40e 100755 --- a/Build/source/texk/web2c/ptexdir/wcfname.test +++ b/Build/source/texk/web2c/ptexdir/wcfname.test @@ -12,20 +12,28 @@ TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS=ptests:.; export TEXINPUTS for loc in C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8 ja_JP.UTF-8 ja_JP.utf8; do - locale -a | grep $loc + locale -a | grep "^$loc\$" ret=$? + # For Slackware linux, we need to replace from utf8 to UTF-8 + if [ -f /etc/slackware-version ]; then + loc=`echo $loc | sed -e "s/utf8/UTF-8/"` + fi if [ $ret = 0 ]; then LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE break fi done -if [ $ret = 1 ]; then +if [ $ret != 0 ]; then # linux musl fails to run `locale -a` but seems to have C.UTF-8 loc=C.UTF-8 LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE fi -perl $srcdir/tests/fn-generate.perl ptests || exit 128 +perl $srcdir/tests/fn-generate.perl ptests +pret=$? +if [ $pret != 0 ] && [ $pret != 239 ]; then + exit 128 +fi # pTeX internal encoding fenc="utf8" @@ -34,12 +42,17 @@ for doc in fn-$fenc fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >ptests/$doc-$ienc-term.log || rc=1 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex ptests/ + mv $doc-$ienc.txt $doc-$ienc.log ptests/ diff ptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=2 done done +if [ $pret = 239 ]; then + echo "*** skip tests for Shift_JIS & EUC-JP." + exit 0 +fi + # pTeX, regacy encoding for fenc in sjis euc; do @@ -56,7 +69,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >ptests/$doc-$fenc-term.log || rc=3 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex ptests/ + mv $doc-$ienc.txt $doc-$ienc.log ptests/ diff ptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=4 done diff --git a/Build/source/texk/web2c/tests/fn-generate.perl b/Build/source/texk/web2c/tests/fn-generate.perl index 01503b5c128..0870a2c4224 100755 --- a/Build/source/texk/web2c/tests/fn-generate.perl +++ b/Build/source/texk/web2c/tests/fn-generate.perl @@ -8,6 +8,8 @@ use warnings; use 5.008; use Encode; +my $st = 0; + foreach $_ (<DATA>) { chomp; my ($encname, $fname0, $fname1) = split ' ', $_; @@ -19,6 +21,8 @@ foreach $_ (<DATA>) { print $ofh $src; } +exit($st ? 239 : 0); + sub make_str ($$;$) { my ($encname, $fname0, $fname1) = @_; @@ -60,7 +64,13 @@ $src .= <<END; \\relax\\end END - Encode::from_to($src, 'utf8', $encname) if ($encname !~ /UTF.*8/i); + if ($encname !~ /UTF.*8/i) { + my $ret = Encode::from_to($src, 'utf8', $encname); + if (!$ret) { + warn "fn-generate.perl: Encode::from_to() failed.\n"; + $st++; + } + } return ($src); } diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 4cc71a045f0..137cffbc72d 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,10 @@ +2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * wcfname.test: + Skip tests for Shift_JIS & EUC-JP if conversion failed. + Report from Ken Moffat. + https://tug.org/pipermail/tex-k/2023-March/003911.html + 2023-03-09 Karl Berry <karl@tug.org> * TL'23 release. diff --git a/Build/source/texk/web2c/uptexdir/wcfname.test b/Build/source/texk/web2c/uptexdir/wcfname.test index deff2ef1fca..c988e1f3e9f 100755 --- a/Build/source/texk/web2c/uptexdir/wcfname.test +++ b/Build/source/texk/web2c/uptexdir/wcfname.test @@ -12,20 +12,27 @@ TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS=uptests:.; export TEXINPUTS for loc in C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8 ja_JP.UTF-8 ja_JP.utf8; do - locale -a | grep $loc + locale -a | grep "^$loc\$" ret=$? + if [ -f /etc/slackware-version ]; then + loc=`echo $loc | sed -e "s/utf8/UTF-8/"` + fi if [ $ret = 0 ]; then LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE break fi done -if [ $ret = 1 ]; then +if [ $ret != 0 ]; then # linux musl fails to run `locale -a` but seems to have C.UTF-8 loc=C.UTF-8 LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE fi -perl $srcdir/tests/fn-generate.perl uptests || exit 128 +perl $srcdir/tests/fn-generate.perl uptests +pret=$? +if [ $pret != 0 ] && [ $pret != 239 ]; then + exit 128 +fi # upTeX internal encoding fenc="utf8" @@ -49,12 +56,17 @@ for doc in fn-$fenc fnさざ波-$fenc fn£¥µÆÇñß-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >uptests/$doc-$ienc-term.log || rc=1 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex uptests/ + mv $doc-$ienc.txt $doc-$ienc.log uptests/ diff uptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=2 done done +if [ $pret = 239 ]; then + echo "*** skip tests for Shift_JIS & EUC-JP." + exit 0 +fi + # pTeX compatible mode, regacy encoding for fenc in sjis euc; do @@ -82,7 +94,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >uptests/$doc-$fenc-term.log || rc=3 - mv $doc-$ienc.txt $doc-$ienc.log fn*-tmp.tex uptests/ + mv $doc-$ienc.txt $doc-$ienc.log uptests/ diff uptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || rc=4 done diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index b90fb3b913f..be5d17862cc 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,8 @@ +2023-03-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * wcfname.test: + Sync with update of fn-generate.perl. + 2023-03-09 Karl Berry <karl@tug.org> * TL'23 release. diff --git a/Build/source/texk/web2c/xetexdir/wcfname.test b/Build/source/texk/web2c/xetexdir/wcfname.test index 1d151b2951f..7cd4bade012 100755 --- a/Build/source/texk/web2c/xetexdir/wcfname.test +++ b/Build/source/texk/web2c/xetexdir/wcfname.test @@ -11,7 +11,11 @@ rc=0 TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF TEXINPUTS=xetests:.; export TEXINPUTS -perl $srcdir/tests/fn-generate.perl xetests || exit 128 +perl $srcdir/tests/fn-generate.perl xetests +pret=$? +if [ $pret != 0 ] && [ $pret != 239 ]; then + exit 128 +fi rm -f xetests/fn*-euc.tex xetests/fn*-sjis.tex if [ "$COMSPEC" != "" ]; then @@ -25,7 +29,7 @@ for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ./xetex -ini -interaction nonstopmode -jobname=$doc --shell-escape $doc.tex >xetests/$doc-term.log || rc=1 - mv $doc.txt $doc.log fn*-tmp.tex xetests/ + mv $doc.txt $doc.log xetests/ diff xetests/$doc.txt $srcdir/tests/fn-utf8.txt || rc=2 done |