From 8dff1f49a546b8ea8cabf0aaeae2597f0bd961a2 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 24 Dec 2023 15:11:59 +0000 Subject: {pdf,xe,{e,}p,{e,}up}tex: Avoid errors on parallel test processing, more git-svn-id: svn://tug.org/texlive/trunk@69210 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/eptexdir/wcfname.test | 20 +++++++++++--------- Build/source/texk/web2c/euptexdir/wcfname.test | 9 +++++---- Build/source/texk/web2c/euptexdir/wcfname0.test | 22 ++++++++++++---------- Build/source/texk/web2c/pdftexdir/wcfname.test | 9 +++++---- Build/source/texk/web2c/ptexdir/wcfname.test | 22 ++++++++++++---------- Build/source/texk/web2c/uptexdir/wcfname.test | 9 +++++---- Build/source/texk/web2c/uptexdir/wcfname0.test | 21 ++++++++++++--------- Build/source/texk/web2c/xetexdir/wcfname.test | 9 +++++---- 8 files changed, 67 insertions(+), 54 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/eptexdir/wcfname.test b/Build/source/texk/web2c/eptexdir/wcfname.test index c89fcabf4f4..2db3d637e83 100755 --- a/Build/source/texk/web2c/eptexdir/wcfname.test +++ b/Build/source/texk/web2c/eptexdir/wcfname.test @@ -70,15 +70,16 @@ for ienc in $try_ienc; do for doc in fn-$fenc fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-ep $_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 -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \ + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=14 + mv $job.txt $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } rm -f $testdir/fn±×÷§¶-utf8-tmp.tex @@ -103,15 +104,16 @@ for doc in fnさざ波-$fenc; do fi echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-ep $_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 -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=24 + mv $job.fls $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } done diff --git a/Build/source/texk/web2c/euptexdir/wcfname.test b/Build/source/texk/web2c/euptexdir/wcfname.test index 99611dfe0f9..bce938395f3 100755 --- a/Build/source/texk/web2c/euptexdir/wcfname.test +++ b/Build/source/texk/web2c/euptexdir/wcfname.test @@ -82,14 +82,15 @@ for doc in fn-$fenc fnさざ波-$fenc fn£¥µÆÇñß-$fenc fnΔДदダ打다 fi echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-eup $_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 -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log $testdir/$job.fls + $_tex -ini -interaction nonstopmode -jobname=$job -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 - cp -p $doc-$ienc.txt $doc-$ienc.log $doc-$ienc.fls $testdir/ || rc=14 - diff $testdir/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || \ + mv $job.txt $job.log $job.fls $testdir/ || rc=14 + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } done diff --git a/Build/source/texk/web2c/euptexdir/wcfname0.test b/Build/source/texk/web2c/euptexdir/wcfname0.test index 22e10fd2b5c..8f7cc05ab67 100755 --- a/Build/source/texk/web2c/euptexdir/wcfname0.test +++ b/Build/source/texk/web2c/euptexdir/wcfname0.test @@ -75,15 +75,16 @@ for doc in fn-$fenc fnさざ波-$fenc; do fi echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-eup0 $_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 -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=14 + mv $job.fls $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } rm -f $testdir/fn±×÷§¶-utf8-tmp.tex @@ -112,15 +113,16 @@ for doc in fnさざ波-$fenc; do export guess_input_kanji_encoding echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-eup0 $_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 -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=24 + mv $job.fls $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } done diff --git a/Build/source/texk/web2c/pdftexdir/wcfname.test b/Build/source/texk/web2c/pdftexdir/wcfname.test index d93f744b36f..28c18f37e7c 100755 --- a/Build/source/texk/web2c/pdftexdir/wcfname.test +++ b/Build/source/texk/web2c/pdftexdir/wcfname.test @@ -64,15 +64,16 @@ fenc="utf8" for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc fnΔДदダ打다𝕯🎉-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc + job=$doc-pdf $_kpsewhich -progname=$engine $doc.tex || rc=10 $_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11 - 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 || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log $testdir/$job.fls + $_tex -ini -interaction nonstopmode -jobname=$job --shell-escape -etex --recorder $doc.tex >$testdir/$doc-term.log || \ { rc=1 ; err1=$err1" $fenc:$doc" ; } $_kpsewhich -progname=$engine $doc-tmp.tex || rc=12 - cp -p $doc.txt $doc.log $doc.fls $testdir/ || rc=14 + mv $job.txt $job.log $job.fls $testdir/ || rc=14 ## It does not work. -## diff $testdir/$doc.txt $srcdir/tests/fn-$fenc.txt || \ +## diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ ## { rc=2 ; err2=$err2" $fenc:$doc" ; } done diff --git a/Build/source/texk/web2c/ptexdir/wcfname.test b/Build/source/texk/web2c/ptexdir/wcfname.test index 3f9121c7167..71ff57ffb72 100755 --- a/Build/source/texk/web2c/ptexdir/wcfname.test +++ b/Build/source/texk/web2c/ptexdir/wcfname.test @@ -70,16 +70,17 @@ for ienc in $try_ienc; do for doc in fn-$fenc fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-p $_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 || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=14 + mv $job.fls $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } rm -f $testdir/fn±×÷§¶-utf8-tmp.tex @@ -104,16 +105,17 @@ for doc in fnさざ波-$fenc; do fi echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-p $_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 || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=24 + mv $job.fls $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } done diff --git a/Build/source/texk/web2c/uptexdir/wcfname.test b/Build/source/texk/web2c/uptexdir/wcfname.test index 541b6212f20..bf8bd5313b9 100755 --- a/Build/source/texk/web2c/uptexdir/wcfname.test +++ b/Build/source/texk/web2c/uptexdir/wcfname.test @@ -82,15 +82,16 @@ for doc in fn-$fenc fnさざ波-$fenc fn£¥µÆÇñß-$fenc fnΔДदダ打다 fi echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-up $_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 || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log $testdir/$job.fls + $_tex -ini -interaction nonstopmode -jobname=$job -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 - cp -p $doc-$ienc.txt $doc-$ienc.log $doc-$ienc.fls $testdir/ || rc=14 - diff $testdir/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || \ + mv $job.txt $job.log $job.fls $testdir/ || rc=14 + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } done diff --git a/Build/source/texk/web2c/uptexdir/wcfname0.test b/Build/source/texk/web2c/uptexdir/wcfname0.test index 2a4c8dbba16..982e77dbf55 100755 --- a/Build/source/texk/web2c/uptexdir/wcfname0.test +++ b/Build/source/texk/web2c/uptexdir/wcfname0.test @@ -75,16 +75,17 @@ for doc in fn-$fenc fnさざ波-$fenc; do fi echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-up0 $_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 || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=14 + mv $job.fls $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } rm -f $testdir/fn±×÷§¶-utf8-tmp.tex @@ -113,15 +114,17 @@ for doc in fnさざ波-$fenc; do export guess_input_kanji_encoding echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc + job=$doc-$ienc-up0 $_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 || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log + $_tex -ini -interaction nonstopmode -jobname=$job -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 - 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 || \ + mv $job.txt $job.log $testdir/ || rc=24 + mv $job.fls $testdir/ || : echo "FIXME" # check *.fls + diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } done diff --git a/Build/source/texk/web2c/xetexdir/wcfname.test b/Build/source/texk/web2c/xetexdir/wcfname.test index 82207676e68..1c12b63e476 100755 --- a/Build/source/texk/web2c/xetexdir/wcfname.test +++ b/Build/source/texk/web2c/xetexdir/wcfname.test @@ -64,14 +64,15 @@ fenc="utf8" for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc + job=$doc-xe $_kpsewhich -progname=$engine $doc.tex || rc=10 $_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11 - 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 || \ + rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log $testdir/$job.fls + $_tex -ini -interaction nonstopmode -jobname=$job --shell-escape -etex --recorder $doc.tex >$testdir/$doc-term.log || \ { rc=1 ; err1=$err1" $fenc:$doc" ; } $_kpsewhich -progname=$engine $doc-tmp.tex || rc=12 - cp -p $doc.txt $doc.log $doc.fls $testdir/ || rc=14 - diff $testdir/$doc.txt $srcdir/tests/fn-utf8.txt || \ + mv $job.txt $job.log $job.fls $testdir/ || rc=14 + diff $testdir/$job.txt $srcdir/tests/fn-utf8.txt || \ { rc=2 ; err2=$err2" $fenc:$doc" ; } done -- cgit v1.2.3