diff options
author | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-12-24 12:49:15 +0000 |
---|---|---|
committer | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-12-24 12:49:15 +0000 |
commit | 3af526243464bacd481ec8c94745bd5a2834a530 (patch) | |
tree | dbc52144acff974bccb3d77a8da857622bb098a8 /Build/source/texk | |
parent | 0a2e8722a68e5eebc8a403c750120b2fb28add8b (diff) |
{pdf,xe,{e,}p,{e,}up}tex: Avoid errors on parallel test processing
git-svn-id: svn://tug.org/texlive/trunk@69209 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-x | Build/source/texk/web2c/eptexdir/wcfname.test | 9 | ||||
-rwxr-xr-x | Build/source/texk/web2c/euptexdir/wcfname.test | 2 | ||||
-rwxr-xr-x | Build/source/texk/web2c/euptexdir/wcfname0.test | 4 | ||||
-rwxr-xr-x | Build/source/texk/web2c/pdftexdir/wcfname.test | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/web2c/ptexdir/wcfname.test | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/web2c/uptexdir/wcfname.test | 5 | ||||
-rwxr-xr-x | Build/source/texk/web2c/uptexdir/wcfname0.test | 8 | ||||
-rwxr-xr-x | Build/source/texk/web2c/xetexdir/wcfname.test | 2 |
10 files changed, 33 insertions, 17 deletions
diff --git a/Build/source/texk/web2c/eptexdir/wcfname.test b/Build/source/texk/web2c/eptexdir/wcfname.test index d34907f693f..c89fcabf4f4 100755 --- a/Build/source/texk/web2c/eptexdir/wcfname.test +++ b/Build/source/texk/web2c/eptexdir/wcfname.test @@ -76,8 +76,8 @@ for doc in fn-$fenc fnさざ波-$fenc; do $_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 - mv $doc-$ienc.txt $doc-$ienc.log $testdir/ || rc=14 - mv $doc-$ienc.txt $testdir/ || : echo "FIXME" # check *.fls + cp -p $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 || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } rm -f $testdir/fn±×÷§¶-utf8-tmp.tex @@ -105,11 +105,12 @@ 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 - rm -f $testdir/$doc-tmp.tex $testdir/$doc-$ienc.txt $testdir/$doc-$ienc.log $testdir/$doc-$ienc.fls + 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 - mv $doc-$ienc.txt $doc-$ienc.log $doc-$ienc.fls $testdir/ || : echo "FIXME" # check *.fls + cp -p $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 || \ { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } diff --git a/Build/source/texk/web2c/euptexdir/wcfname.test b/Build/source/texk/web2c/euptexdir/wcfname.test index e4b28f6da17..99611dfe0f9 100755 --- a/Build/source/texk/web2c/euptexdir/wcfname.test +++ b/Build/source/texk/web2c/euptexdir/wcfname.test @@ -88,7 +88,7 @@ for doc in fn-$fenc fnさざ波-$fenc fn£¥µÆÇñß-$fenc fnΔДदダ打다 $_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 - mv $doc-$ienc.txt $doc-$ienc.log $doc-$ienc.fls $testdir/ || rc=14 + cp -p $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 d04cc6ae74b..22e10fd2b5c 100755 --- a/Build/source/texk/web2c/euptexdir/wcfname0.test +++ b/Build/source/texk/web2c/euptexdir/wcfname0.test @@ -81,7 +81,7 @@ for doc in fn-$fenc fnさざ波-$fenc; do $_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 - mv $doc-$ienc.txt $doc-$ienc.log $testdir/ || rc=14 + cp -p $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 || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } @@ -118,7 +118,7 @@ for doc in fnさざ波-$fenc; do $_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 - mv $doc-$ienc.txt $doc-$ienc.log $testdir/ || rc=24 + cp -p $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 || \ { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } diff --git a/Build/source/texk/web2c/pdftexdir/wcfname.test b/Build/source/texk/web2c/pdftexdir/wcfname.test index df001878847..d93f744b36f 100755 --- a/Build/source/texk/web2c/pdftexdir/wcfname.test +++ b/Build/source/texk/web2c/pdftexdir/wcfname.test @@ -70,7 +70,7 @@ for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc fnΔДदダ打다 $_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 - mv $doc.txt $doc.log $doc.fls $testdir/ || rc=14 + cp -p $doc.txt $doc.log $doc.fls $testdir/ || rc=14 ## It does not work. ## diff $testdir/$doc.txt $srcdir/tests/fn-$fenc.txt || \ ## { rc=2 ; err2=$err2" $fenc:$doc" ; } diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index ffd56a55c81..8623a6fb4a6 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/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/ptexdir/wcfname.test b/Build/source/texk/web2c/ptexdir/wcfname.test index f20a66a75bf..3f9121c7167 100755 --- a/Build/source/texk/web2c/ptexdir/wcfname.test +++ b/Build/source/texk/web2c/ptexdir/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= @@ -72,11 +72,12 @@ 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 + 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 --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 + cp -p $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 || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } @@ -105,11 +106,12 @@ 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 + 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 --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 + cp -p $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 || \ { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 18d98a88093..a4ade2e66df 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/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-11-25 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * wcfname{,0}.test: Add tests for --recorder and *.fls. diff --git a/Build/source/texk/web2c/uptexdir/wcfname.test b/Build/source/texk/web2c/uptexdir/wcfname.test index c0bf2a2c26e..541b6212f20 100755 --- a/Build/source/texk/web2c/uptexdir/wcfname.test +++ b/Build/source/texk/web2c/uptexdir/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= @@ -84,11 +84,12 @@ 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 + 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 --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 + cp -p $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/uptexdir/wcfname0.test b/Build/source/texk/web2c/uptexdir/wcfname0.test index 3ee99ce45d4..2a4c8dbba16 100755 --- a/Build/source/texk/web2c/uptexdir/wcfname0.test +++ b/Build/source/texk/web2c/uptexdir/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= @@ -77,11 +77,12 @@ 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 + 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 --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 + cp -p $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 || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } @@ -114,11 +115,12 @@ 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 + 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 --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 + cp -p $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/xetexdir/wcfname.test b/Build/source/texk/web2c/xetexdir/wcfname.test index 1281c25889b..82207676e68 100755 --- a/Build/source/texk/web2c/xetexdir/wcfname.test +++ b/Build/source/texk/web2c/xetexdir/wcfname.test @@ -70,7 +70,7 @@ for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc; do $_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 - mv $doc.txt $doc.log $doc.fls $testdir/ || rc=14 + cp -p $doc.txt $doc.log $doc.fls $testdir/ || rc=14 diff $testdir/$doc.txt $srcdir/tests/fn-utf8.txt || \ { rc=2 ; err2=$err2" $fenc:$doc" ; } |