From 0a2e8722a68e5eebc8a403c750120b2fb28add8b Mon Sep 17 00:00:00 2001
From: Takuji Tanaka <ttk@t-lab.opal.ne.jp>
Date: Sun, 24 Dec 2023 11:16:21 +0000
Subject: {pdf,xe,ep,eup}tex: Avoid errors on parallel test processing

git-svn-id: svn://tug.org/texlive/trunk@69208 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/texk/web2c/ChangeLog               |  5 +++++
 Build/source/texk/web2c/eptexdir/ChangeLog      |  5 +++++
 Build/source/texk/web2c/eptexdir/wcfname.test   | 12 ++++++------
 Build/source/texk/web2c/euptexdir/ChangeLog     |  5 +++++
 Build/source/texk/web2c/euptexdir/wcfname.test  |  8 ++++----
 Build/source/texk/web2c/euptexdir/wcfname0.test | 12 ++++++------
 Build/source/texk/web2c/pdftexdir/ChangeLog     |  5 +++++
 Build/source/texk/web2c/pdftexdir/wcfname.test  |  8 ++++----
 Build/source/texk/web2c/tests/fn-generate.perl  | 15 +++++++++++++--
 Build/source/texk/web2c/xetexdir/ChangeLog      |  5 +++++
 Build/source/texk/web2c/xetexdir/wcfname.test   |  8 ++++----
 11 files changed, 62 insertions(+), 26 deletions(-)

(limited to 'Build')

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 3152d97880c..674181adcd2 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-24  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* tests/fn-generate.perl:
+	Add option -randgen for parallel tests.
+
 2023-12-23  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* Makefile.in, ac/web2c.ac (eptex):
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index baada61bbc2..b83de73d4a5 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-24  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* wcfname.test:
+	Avoid errors on parallel test processing.
+
 2023-11-25  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* wcfname.test: Add tests for --recorder and *.fls.
diff --git a/Build/source/texk/web2c/eptexdir/wcfname.test b/Build/source/texk/web2c/eptexdir/wcfname.test
index 502880d742c..d34907f693f 100755
--- a/Build/source/texk/web2c/eptexdir/wcfname.test
+++ b/Build/source/texk/web2c/eptexdir/wcfname.test
@@ -13,7 +13,7 @@ _kpsewhich=$KpsDir/kpsewhich$ExeExt
 _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 @@ else
   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 @@ for doc in fn-$fenc fnさざ波-$fenc; do
   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 @@ for doc in fnさざ波-$fenc; do
   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" ; }
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 0d016f8efb9..6dc6e9a078b 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-24  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* wcfname{,0}.test:
+	Avoid errors on parallel test processing.
+
 2023-12-23  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* am/euptex.am:
diff --git a/Build/source/texk/web2c/euptexdir/wcfname.test b/Build/source/texk/web2c/euptexdir/wcfname.test
index f8c56d732f1..e4b28f6da17 100755
--- a/Build/source/texk/web2c/euptexdir/wcfname.test
+++ b/Build/source/texk/web2c/euptexdir/wcfname.test
@@ -13,7 +13,7 @@ _kpsewhich=$KpsDir/kpsewhich$ExeExt
 _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 @@ else
   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 @@ for doc in fn-$fenc fnさざ波-$fenc fn£¥µÆÇñß-$fenc fnΔДदダ打다
   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" ; }
diff --git a/Build/source/texk/web2c/euptexdir/wcfname0.test b/Build/source/texk/web2c/euptexdir/wcfname0.test
index e6199b0c8db..d04cc6ae74b 100755
--- a/Build/source/texk/web2c/euptexdir/wcfname0.test
+++ b/Build/source/texk/web2c/euptexdir/wcfname0.test
@@ -13,7 +13,7 @@ _kpsewhich=$KpsDir/kpsewhich$ExeExt
 _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 @@ else
   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 @@ for doc in fn-$fenc fnさざ波-$fenc; do
   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 @@ for doc in fnさざ波-$fenc; do
   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 || \
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 223c74b527d..87762fb9eb1 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-24  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* wcfname.test:
+	Avoid errors on parallel test processing.
+
 2023-11-25  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* wcfname.test: Add tests for --recorder and *.fls.
diff --git a/Build/source/texk/web2c/pdftexdir/wcfname.test b/Build/source/texk/web2c/pdftexdir/wcfname.test
index 20d34b003e6..df001878847 100755
--- a/Build/source/texk/web2c/pdftexdir/wcfname.test
+++ b/Build/source/texk/web2c/pdftexdir/wcfname.test
@@ -13,7 +13,7 @@ _kpsewhich=$KpsDir/kpsewhich$ExeExt
 _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 @@ else
   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 @@ for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc fnΔДदダ打다
   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 || \
diff --git a/Build/source/texk/web2c/tests/fn-generate.perl b/Build/source/texk/web2c/tests/fn-generate.perl
index 11829c66da3..9d9ec66001d 100755
--- a/Build/source/texk/web2c/tests/fn-generate.perl
+++ b/Build/source/texk/web2c/tests/fn-generate.perl
@@ -10,6 +10,7 @@ use Encode;
 
 my $st = 0;
 our $windows; # option -windows
+our $randgen; # option -randgen
 
 foreach $_ (<DATA>) {
     chomp;
@@ -27,11 +28,13 @@ exit($st ? 239 : 0);
 
 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
@@ -44,6 +47,14 @@ $src = <<END;
 \\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}
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index d832731c013..1db5ae81dc7 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-24  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* wcfname.test:
+	Avoid errors on parallel test processing.
+
 2023-11-25  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* wcfname.test: Add tests for --recorder and *.fls.
diff --git a/Build/source/texk/web2c/xetexdir/wcfname.test b/Build/source/texk/web2c/xetexdir/wcfname.test
index 78c63264d82..1281c25889b 100755
--- a/Build/source/texk/web2c/xetexdir/wcfname.test
+++ b/Build/source/texk/web2c/xetexdir/wcfname.test
@@ -13,7 +13,7 @@ _kpsewhich=$KpsDir/kpsewhich$ExeExt
 _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 @@ else
   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 @@ for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc; do
   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" ; }
-- 
cgit v1.2.3