texlive[66702] Build/source/texk/web2c: (e)(u)ptex: skip tests for
commits+takuji at tug.org
commits+takuji at tug.org
Wed Mar 29 14:18:50 CEST 2023
Revision: 66702
http://tug.org/svn/texlive?view=revision&revision=66702
Author: takuji
Date: 2023-03-29 14:18:50 +0200 (Wed, 29 Mar 2023)
Log Message:
-----------
(e)(u)ptex: skip tests for Shift_JIS/EUC-JP if conversion failed
Modified Paths:
--------------
trunk/Build/source/texk/web2c/ChangeLog
trunk/Build/source/texk/web2c/eptexdir/ChangeLog
trunk/Build/source/texk/web2c/eptexdir/wcfname.test
trunk/Build/source/texk/web2c/euptexdir/ChangeLog
trunk/Build/source/texk/web2c/euptexdir/wcfname.test
trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
trunk/Build/source/texk/web2c/pdftexdir/wcfname.test
trunk/Build/source/texk/web2c/ptexdir/ChangeLog
trunk/Build/source/texk/web2c/ptexdir/wcfname.test
trunk/Build/source/texk/web2c/tests/fn-generate.perl
trunk/Build/source/texk/web2c/uptexdir/ChangeLog
trunk/Build/source/texk/web2c/uptexdir/wcfname.test
trunk/Build/source/texk/web2c/xetexdir/ChangeLog
trunk/Build/source/texk/web2c/xetexdir/wcfname.test
Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/ChangeLog 2023-03-29 12:18:50 UTC (rev 66702)
@@ -1,3 +1,10 @@
+2023-03-29 TANAKA Takuji <ttk at 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 at yahoo.co.jp>
* tests/fn-generate.perl:
Modified: trunk/Build/source/texk/web2c/eptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/ChangeLog 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/eptexdir/ChangeLog 2023-03-29 12:18:50 UTC (rev 66702)
@@ -1,3 +1,10 @@
+2023-03-29 TANAKA Takuji <ttk at 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 at tug.org>
* TL'23 release.
Modified: trunk/Build/source/texk/web2c/eptexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/wcfname.test 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/eptexdir/wcfname.test 2023-03-29 12:18:50 UTC (rev 66702)
@@ -12,20 +12,28 @@
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,13 +42,18 @@
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
for doc in fnさざ波-$fenc; do
@@ -56,7 +69,7 @@
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
Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2023-03-29 12:18:50 UTC (rev 66702)
@@ -1,3 +1,10 @@
+2023-03-29 TANAKA Takuji <ttk at 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 at tug.org>
* TL'23 release.
Modified: trunk/Build/source/texk/web2c/euptexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/wcfname.test 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/euptexdir/wcfname.test 2023-03-29 12:18:50 UTC (rev 66702)
@@ -12,20 +12,27 @@
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,13 +56,18 @@
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
for doc in fnさざ波-$fenc; do
@@ -82,7 +94,7 @@
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
Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog 2023-03-29 12:18:50 UTC (rev 66702)
@@ -1,3 +1,8 @@
+2023-03-29 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * wcfname.test:
+ Sync with update of fn-generate.perl.
+
2023-03-09 Karl Berry <karl at tug.org>
* TL'23 release.
Modified: trunk/Build/source/texk/web2c/pdftexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/wcfname.test 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/pdftexdir/wcfname.test 2023-03-29 12:18:50 UTC (rev 66702)
@@ -11,7 +11,11 @@
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 @@
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
Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2023-03-29 12:18:50 UTC (rev 66702)
@@ -1,3 +1,10 @@
+2023-03-29 TANAKA Takuji <ttk at 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 at tug.org>
* TL'23 release.
Modified: trunk/Build/source/texk/web2c/ptexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/wcfname.test 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/ptexdir/wcfname.test 2023-03-29 12:18:50 UTC (rev 66702)
@@ -12,20 +12,28 @@
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,13 +42,18 @@
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
for doc in fnさざ波-$fenc; do
@@ -56,7 +69,7 @@
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
Modified: trunk/Build/source/texk/web2c/tests/fn-generate.perl
===================================================================
--- trunk/Build/source/texk/web2c/tests/fn-generate.perl 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/tests/fn-generate.perl 2023-03-29 12:18:50 UTC (rev 66702)
@@ -8,6 +8,8 @@
use 5.008;
use Encode;
+my $st = 0;
+
foreach $_ (<DATA>) {
chomp;
my ($encname, $fname0, $fname1) = split ' ', $_;
@@ -19,7 +21,9 @@
print $ofh $src;
}
+exit($st ? 239 : 0);
+
sub make_str ($$;$) {
my ($encname, $fname0, $fname1) = @_;
my ($src);
@@ -60,7 +64,13 @@
\\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);
}
Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2023-03-29 12:18:50 UTC (rev 66702)
@@ -1,3 +1,10 @@
+2023-03-29 TANAKA Takuji <ttk at 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 at tug.org>
* TL'23 release.
Modified: trunk/Build/source/texk/web2c/uptexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/wcfname.test 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/uptexdir/wcfname.test 2023-03-29 12:18:50 UTC (rev 66702)
@@ -12,20 +12,27 @@
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,13 +56,18 @@
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
for doc in fnさざ波-$fenc; do
@@ -82,7 +94,7 @@
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
Modified: trunk/Build/source/texk/web2c/xetexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2023-03-29 12:18:50 UTC (rev 66702)
@@ -1,3 +1,8 @@
+2023-03-29 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * wcfname.test:
+ Sync with update of fn-generate.perl.
+
2023-03-09 Karl Berry <karl at tug.org>
* TL'23 release.
Modified: trunk/Build/source/texk/web2c/xetexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/wcfname.test 2023-03-28 23:48:46 UTC (rev 66701)
+++ trunk/Build/source/texk/web2c/xetexdir/wcfname.test 2023-03-29 12:18:50 UTC (rev 66702)
@@ -11,7 +11,11 @@
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 @@
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
More information about the tex-live-commits
mailing list.