texlive[69208] Build/source/texk/web2c: {pdf,xe,ep,eup}tex: Avoid
commits+takuji at tug.org
commits+takuji at tug.org
Sun Dec 24 12:16:22 CET 2023
Revision: 69208
https://tug.org/svn/texlive?view=revision&revision=69208
Author: takuji
Date: 2023-12-24 12:16:21 +0100 (Sun, 24 Dec 2023)
Log Message:
-----------
{pdf,xe,ep,eup}tex: Avoid errors on parallel test processing
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/euptexdir/wcfname0.test
trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
trunk/Build/source/texk/web2c/pdftexdir/wcfname.test
trunk/Build/source/texk/web2c/tests/fn-generate.perl
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-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/ChangeLog 2023-12-24 11:16:21 UTC (rev 69208)
@@ -1,3 +1,8 @@
+2023-12-24 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * tests/fn-generate.perl:
+ Add option -randgen for parallel tests.
+
2023-12-23 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* Makefile.in, ac/web2c.ac (eptex):
Modified: trunk/Build/source/texk/web2c/eptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/ChangeLog 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/eptexdir/ChangeLog 2023-12-24 11:16:21 UTC (rev 69208)
@@ -1,3 +1,8 @@
+2023-12-24 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * wcfname.test:
+ Avoid errors on parallel test processing.
+
2023-11-25 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* wcfname.test: Add tests for --recorder and *.fls.
Modified: trunk/Build/source/texk/web2c/eptexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/wcfname.test 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/eptexdir/wcfname.test 2023-12-24 11:16:21 UTC (rev 69208)
@@ -13,7 +13,7 @@
_tex=$BinDir/$engine$ExeExt
test -d $testdir || mkdir -p $testdir
-rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*.tex fn*.tex
+rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*-tmp*.tex
rc=0; err1=; err2=; err3=; err4=
@@ -58,7 +58,7 @@
opt_win=
fi
-perl -s $srcdir/tests/fn-generate.perl $opt_win $testdir
+perl -s $srcdir/tests/fn-generate.perl $opt_win -randgen=pdfuniformdeviate $testdir
pret=$?
if [ $pret != 0 ] && [ $pret != 239 ]; then
exit 77
@@ -72,10 +72,10 @@
echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc
$_kpsewhich -progname=$engine $doc.tex || rc=10
$_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11
- $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
+ rm -f $testdir/$doc-tmp.tex $testdir/$doc-$ienc.txt $testdir/$doc-$ienc.log
+ $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
{ rc=1 ; err1=$err1" $fenc:$ienc:$doc" ; }
$_kpsewhich -progname=$engine $doc-tmp.tex || rc=12
- $_kpsewhich -progname=$engine fn±×÷§¶-utf8-tmp.tex || rc=13
mv $doc-$ienc.txt $doc-$ienc.log $testdir/ || rc=14
mv $doc-$ienc.txt $testdir/ || : echo "FIXME" # check *.fls
diff $testdir/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || \
@@ -105,10 +105,10 @@
echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc
$_kpsewhich -progname=$engine $doc.tex || rc=20
$_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=21
- $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
+ rm -f $testdir/$doc-tmp.tex $testdir/$doc-$ienc.txt $testdir/$doc-$ienc.log $testdir/$doc-$ienc.fls
+ $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
{ rc=3 ; err3=$err3" $fenc:$ienc:$doc" ; }
$_kpsewhich -progname=$engine $doc-tmp.tex || rc=22
- $_kpsewhich -progname=$engine fn±×÷§¶-utf8-tmp.tex || rc=23
mv $doc-$ienc.txt $doc-$ienc.log $doc-$ienc.fls $testdir/ || : echo "FIXME" # check *.fls
diff $testdir/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || \
{ rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; }
Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2023-12-24 11:16:21 UTC (rev 69208)
@@ -1,3 +1,8 @@
+2023-12-24 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * wcfname{,0}.test:
+ Avoid errors on parallel test processing.
+
2023-12-23 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* am/euptex.am:
Modified: trunk/Build/source/texk/web2c/euptexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/wcfname.test 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/euptexdir/wcfname.test 2023-12-24 11:16:21 UTC (rev 69208)
@@ -13,7 +13,7 @@
_tex=$BinDir/$engine$ExeExt
test -d $testdir || mkdir -p $testdir
-rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*.tex fn*.tex
+rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*-tmp*.tex
rc=0; err1=; err2=
@@ -56,7 +56,7 @@
opt_win=
fi
-perl -s $srcdir/tests/fn-generate.perl $opt_win $testdir
+perl -s $srcdir/tests/fn-generate.perl $opt_win -randgen=pdfuniformdeviate $testdir
pret=$?
if [ $pret != 0 ] && [ $pret != 239 ]; then
exit 77
@@ -84,10 +84,10 @@
echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc
$_kpsewhich -progname=$engine $doc.tex || rc=10
$_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11
- $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
+ rm -f $testdir/$doc-tmp.tex $testdir/$doc-$ienc.txt $testdir/$doc-$ienc.log $testdir/$doc-$ienc.fls
+ $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
{ rc=1 ; err1=$err1" $fenc:$ienc:$doc" ; }
$_kpsewhich -progname=$engine $doc-tmp.tex || rc=12
- $_kpsewhich -progname=$engine fn±×÷§¶-utf8-tmp.tex || rc=13
mv $doc-$ienc.txt $doc-$ienc.log $doc-$ienc.fls $testdir/ || rc=14
diff $testdir/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || \
{ rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; }
Modified: trunk/Build/source/texk/web2c/euptexdir/wcfname0.test
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/wcfname0.test 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/euptexdir/wcfname0.test 2023-12-24 11:16:21 UTC (rev 69208)
@@ -13,7 +13,7 @@
_tex=$BinDir/$engine$ExeExt
test -d $testdir || mkdir -p $testdir
-rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*.tex fn*.tex
+rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*-tmp*.tex
rc=0; err1=; err2=; err3=; err4=
@@ -58,7 +58,7 @@
opt_win=
fi
-perl -s $srcdir/tests/fn-generate.perl $opt_win $testdir
+perl -s $srcdir/tests/fn-generate.perl $opt_win -randgen=pdfuniformdeviate $testdir
pret=$?
if [ $pret != 0 ] && [ $pret != 239 ]; then
exit 77
@@ -77,10 +77,10 @@
echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc
$_kpsewhich -progname=$engine $doc.tex || rc=10
$_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11
- $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
+ rm -f $testdir/$doc-tmp.tex $testdir/$doc-$ienc.txt $testdir/$doc-$ienc.log
+ $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
{ rc=1 ; err1=$err1" $fenc:$ienc:$doc" ; }
$_kpsewhich -progname=$engine $doc-tmp.tex || rc=12
- $_kpsewhich -progname=$engine fn±×÷§¶-utf8-tmp.tex || rc=13
mv $doc-$ienc.txt $doc-$ienc.log $testdir/ || rc=14
mv $doc-$ienc.fls $testdir/ || : echo "FIXME" # check *.fls
diff $testdir/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || \
@@ -114,10 +114,10 @@
echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc
$_kpsewhich -progname=$engine $doc.tex || rc=20
$_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=21
- $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
+ rm -f $testdir/$doc-tmp.tex $testdir/$doc-$ienc.txt $testdir/$doc-$ienc.log
+ $_tex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \
{ rc=3 ; err3=$err3" $fenc:$ienc:$doc" ; }
$_kpsewhich -progname=$engine $doc-tmp.tex || rc=22
- $_kpsewhich -progname=$engine fn±×÷§¶-utf8-tmp.tex || rc=23
mv $doc-$ienc.txt $doc-$ienc.log $testdir/ || rc=24
mv $doc-$ienc.fls $testdir/ || : echo "FIXME" # check *.fls
diff $testdir/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || \
Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog 2023-12-24 11:16:21 UTC (rev 69208)
@@ -1,3 +1,8 @@
+2023-12-24 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * wcfname.test:
+ Avoid errors on parallel test processing.
+
2023-11-25 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* wcfname.test: Add tests for --recorder and *.fls.
Modified: trunk/Build/source/texk/web2c/pdftexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/wcfname.test 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/pdftexdir/wcfname.test 2023-12-24 11:16:21 UTC (rev 69208)
@@ -13,7 +13,7 @@
_tex=$BinDir/$engine$ExeExt
test -d $testdir || mkdir -p $testdir
-rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*.tex fn*.tex
+rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*-tmp*.tex
rc=0; err1=; err2=
@@ -53,7 +53,7 @@
opt_win=
fi
-perl -s $srcdir/tests/fn-generate.perl $opt_win $testdir
+perl -s $srcdir/tests/fn-generate.perl $opt_win -randgen=pdfuniformdeviate $testdir
pret=$?
if [ $pret != 0 ] && [ $pret != 239 ]; then
exit 77
@@ -66,10 +66,10 @@
echo '>>> Document:'$doc ' File Encoding:'$fenc
$_kpsewhich -progname=$engine $doc.tex || rc=10
$_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11
- $_tex -ini -interaction nonstopmode -jobname=$doc --shell-escape --recorder $doc.tex >$testdir/$doc-term.log || \
+ rm -f $testdir/$doc-tmp.tex $testdir/$doc.txt $testdir/$doc.log $testdir/$doc.fls
+ $_tex -ini -interaction nonstopmode -jobname=$doc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-term.log || \
{ rc=1 ; err1=$err1" $fenc:$doc" ; }
$_kpsewhich -progname=$engine $doc-tmp.tex || rc=12
- $_kpsewhich -progname=$engine fn±×÷§¶-utf8-tmp.tex || rc=13
mv $doc.txt $doc.log $doc.fls $testdir/ || rc=14
## It does not work.
## diff $testdir/$doc.txt $srcdir/tests/fn-$fenc.txt || \
Modified: trunk/Build/source/texk/web2c/tests/fn-generate.perl
===================================================================
--- trunk/Build/source/texk/web2c/tests/fn-generate.perl 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/tests/fn-generate.perl 2023-12-24 11:16:21 UTC (rev 69208)
@@ -10,6 +10,7 @@
my $st = 0;
our $windows; # option -windows
+our $randgen; # option -randgen
foreach $_ (<DATA>) {
chomp;
@@ -27,12 +28,14 @@
sub make_str ($$;$) {
my ($encname, $fname0, $fname1) = @_;
- my ($src);
+ my ($src, $rand) = ('', '');
my ($fnameT) = $fname0;
my $cmnt = $windows ? '%' : ''; # comment out if option -windows
- $fnameT =~ s/\.tex$/-tmp.tex/;
+ $rand= '\rnd' if (!$fname1 && $randgen);
+ $fnameT =~ s/\.tex$/-tmp$rand.tex/;
+
$src = <<END;
\% $fname0
\% $encname encoding
@@ -44,7 +47,15 @@
\\immediate\\openout0=\\jobname.txt
\\immediate\\write0{abc αβγ абв あア※￥ 天地人}
\\immediate\\closeout0
+END
+$src .= <<END if (!$fname1 && $randgen);
+
+\\edef\\rnd{\\the\\numexpr\\${randgen}900000+100000\\relax}
+END
+
+$src .= <<END;
+
\\immediate\\openout1=$fnameT
\\immediate\\write1{\\relax}
\\immediate\\closeout1
Modified: trunk/Build/source/texk/web2c/xetexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2023-12-24 11:16:21 UTC (rev 69208)
@@ -1,3 +1,8 @@
+2023-12-24 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * wcfname.test:
+ Avoid errors on parallel test processing.
+
2023-11-25 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* wcfname.test: Add tests for --recorder and *.fls.
Modified: trunk/Build/source/texk/web2c/xetexdir/wcfname.test
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/wcfname.test 2023-12-24 00:46:13 UTC (rev 69207)
+++ trunk/Build/source/texk/web2c/xetexdir/wcfname.test 2023-12-24 11:16:21 UTC (rev 69208)
@@ -13,7 +13,7 @@
_tex=$BinDir/$engine$ExeExt
test -d $testdir || mkdir -p $testdir
-rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*.tex fn*.tex
+rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*-tmp*.tex
rc=0; err1=; err2=
@@ -53,7 +53,7 @@
opt_win=
fi
-perl -s $srcdir/tests/fn-generate.perl $opt_win $testdir
+perl -s $srcdir/tests/fn-generate.perl $opt_win -randgen=uniformdeviate $testdir
pret=$?
if [ $pret != 0 ] && [ $pret != 239 ]; then
exit 77
@@ -66,10 +66,10 @@
echo '>>> Document:'$doc ' File Encoding:'$fenc
$_kpsewhich -progname=$engine $doc.tex || rc=10
$_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11
- $_tex -ini -interaction nonstopmode -jobname=$doc --shell-escape --recorder $doc.tex >$testdir/$doc-term.log || \
+ rm -f $testdir/$doc-tmp.tex $testdir/$doc.txt $testdir/$doc.log $testdir/$doc.fls
+ $_tex -ini -interaction nonstopmode -jobname=$doc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-term.log || \
{ rc=1 ; err1=$err1" $fenc:$doc" ; }
$_kpsewhich -progname=$engine $doc-tmp.tex || rc=12
- $_kpsewhich -progname=$engine fn±×÷§¶-utf8-tmp.tex || rc=13
mv $doc.txt $doc.log $doc.fls $testdir/ || rc=14
diff $testdir/$doc.txt $srcdir/tests/fn-utf8.txt || \
{ rc=2 ; err2=$err2" $fenc:$doc" ; }
More information about the tex-live-commits
mailing list.