diff options
Diffstat (limited to 'Build/source')
18 files changed, 531 insertions, 77 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 71d93499f2e..2aec4aaec9b 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,9 @@ +2023-11-24 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * eptriptest.test, eptrip/eptrip.{log,tex}: + Check diffs of trip.{fot,typ} with ignoring trivial changes + in trip tests. + 2023-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * {eptriptest,epver}.test: diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.log b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.log index ee7da67d4fe..1d166fdd58a 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.log +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.log @@ -1,8 +1,8 @@ -This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25 +This is e-pTeX, Version 3.141592653-p4.1.1-230214-2.6 (utf8.euc) (TeX Live 2023) (preloaded format=etrip 2023.2.14) 14 FEB 2023 11:25 entering extended mode **&etrip etrip (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. +This is the e-Trip test [2021-01-28] for e-TeX v3.141592653-2.6. (You are using e-TeX version/revision 2.6) Missing character: There is no b in font nullfont! @@ -1423,7 +1423,7 @@ you left one out. Proceed, with fingers crossed. ### math mode entered at line 524 \mathord .\fam1 r -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord @@ -1447,7 +1447,7 @@ this will be denominator of: ### math mode entered at line 517 \mathord .\fam1 r -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord @@ -1494,7 +1494,7 @@ l.525 ... \over r\showlists ### math mode entered at line 517 \mathord .\fam1 r -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord @@ -1542,7 +1542,7 @@ l.526 ... \right]\showlists ../.\fam1 r ..\right"162362 .\right"162362 -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.tex b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.tex index 60590e17c02..6d359151e47 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.tex +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.tex @@ -1,4 +1,4 @@ -%%; This is `eptrip.tex' for e-pTeX v3.14159265-2.6 as of Jan 22, 2014. +%%; This is `eptrip.tex' for e-pTeX v3.141592653-2.6 as of Jan 28, 2021. %%; %%; This is a diabolical test file for e-pTeX, an extension of TeX82. %%; It is not as diabolical as `trip.tex', Knuth's torture test for TeX. @@ -9,8 +9,8 @@ %%; ==>> wrong e-TeX input to produce errors and warnings. <<== %%; \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=} -\def\etripdate {2014-01-22} -\def\texversion {3.14159265} +\def\etripdate {2021-01-28} +\def\texversion {3.141592653} \def\etripversion{2.6} % \message{This is the e-Trip test [\etripdate] for diff --git a/Build/source/texk/web2c/eptexdir/eptriptest.test b/Build/source/texk/web2c/eptexdir/eptriptest.test index db82a98d1b0..c295d745554 100755 --- a/Build/source/texk/web2c/eptexdir/eptriptest.test +++ b/Build/source/texk/web2c/eptexdir/eptriptest.test @@ -1,5 +1,6 @@ #! /bin/sh -vx # $Id$ +# Copyright 2023 Japanese TeX Development Community <issue@texjp.org> # Copyright 2017-2018 Karl Berry <tex-live@tug.org> # Copyright 2011-2014 Peter Breitenlohner <tex-live@tug.org> # Copyright 2010 Hironori Kitagawa <tex-live@tug.org> @@ -23,6 +24,58 @@ TEXMFCNF=$eptestdir; export TEXMFCNF rm -rf eptripdir mkdir eptripdir cd eptripdir +mkdir -p a b + +# TeX Live generic +cat >filter <<-\_EOF + /^\*\* \&trip trip/d + /^\*\*entering extended mode/d + s,^(trip\.tex ##,**(./trip.tex ##, + s,^## (\./trip\.tex,**(./trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// + s/(preloaded format=.*tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342.../down4 639342208/ + s/y4 2039217../y4 203921760/ + s/y0 2039217../y0 203921760/ + _EOF + +# epTeX +cat >>filter <<-\_EOF + s/This is .*TeX,/This is *TeX,/ + s/(utf8[^)]*) // + s/ Version 3\.141592653[^(]*(/ Version 3.141592653* (/ + s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / + s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / + s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ + _EOF +cat >filter1 <<-\_EOF + :l + N + $!b l + s/ inside a group at level 1).*bottom level/ inside a group at level 1)/ + _EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" @@ -61,17 +114,23 @@ diff $testdir/tripin.log cptripin.log rm -f trip.log $_eptex --progname=eptex <$testdir/trip2.in >cptrip.fot sed "$P_SED1;$P_SED2" trip.log > cptrip.log -diff $testdir/trip.fot cptrip.fot +#diff $testdir/trip.fot cptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log mv tripos.tex cptripos.tex diff $testdir/tripos.tex cptripos.tex eval $_dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/$f + sed -f filter cp$f >b/$f + diff a/$f b/$f || is_OK=false +done mv trip.fmt ctrip.fmt @@ -92,17 +151,23 @@ diff $testdir/tripin.log xptripin.log rm -f trip.log $_eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot sed "$P_SED1;$P_SED2" trip.log > xptrip.log -diff $testdir/trip.fot xptrip.fot +#diff $testdir/trip.fot xptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log mv tripos.tex xptripos.tex diff $testdir/tripos.tex xptripos.tex eval $_dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/x$f + sed -f filter xp$f | sed -f filter1 >b/x$f + diff a/x$f b/x$f || is_OK=false +done mv trip.fmt xtrip.fmt @@ -130,7 +195,7 @@ diff $etestdir/etripin.log eptripin.log # May as well test non-ini second time through. $_eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot sed "$P_SED1;$P_SED2" etrip.log > eptrip.log -diff $etestdir/etrip.fot eptrip.fot +#diff $etestdir/etrip.fot eptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. @@ -140,7 +205,13 @@ mv etrip.out eptrip.out diff $etestdir/etrip.out eptrip.out eval $_dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 -$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ +#$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $etestdir/e$f >a/e$f + sed -f filter ep$f >b/e$f + diff a/e$f b/e$f || is_OK=false +done $is_OK || { echo ">>> There were some errors." >&2 diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index b7785ce5f0d..3a0e2816d25 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,9 @@ +2023-11-24 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * etriptest.test, etrip/etrip.{fot,log,typ}, etrip/etripin.log: + Check diffs of trip.{fot,typ} with ignoring trivial changes + in trip tests. + 2023-09-17 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * {etriptest,wprob}.test: diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.fot b/Build/source/texk/web2c/etexdir/etrip/etrip.fot index c1c8210f47b..7292604842a 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.fot +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.fot @@ -1,7 +1,7 @@ -This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) +This is e-TeX, Version 3.141592653-2.6 (TeX Live 2023) (preloaded format=etex) **entering extended mode (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. +This is the e-Trip test [2021-01-28] for e-TeX v3.141592653-2.6. (You are using e-TeX version/revision 2.6) Missing character: There is no c in font nullfont! @@ -43,5 +43,3 @@ current interactionmode (l.247): scroll current interactionmode (l.247): nonstop -\openout1 = `etrip.out'. - diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.log b/Build/source/texk/web2c/etexdir/etrip/etrip.log index b694b2ce46b..9be8d974dce 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.log +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.log @@ -1,8 +1,8 @@ -This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25 +This is e-TeX, Version 3.141592653-2.6 (TeX Live 2023) (preloaded format=etrip 2023.1.22) 22 JAN 2023 11:25 entering extended mode **&etrip etrip (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. +This is the e-Trip test [2021-01-28] for e-TeX v3.141592653-2.6. (You are using e-TeX version/revision 2.6) Missing character: There is no b in font nullfont! @@ -689,9 +689,7 @@ Completed box being shipped out [1] .\write1{\unexpanded \expandafter {\1}} .\closeout1 -\openout1 = `etrip.out'. - -Memory usage before: 52&184; after: 36&178; still untouched: 1672 +Memory usage before: 52&185; after: 36&179; still untouched: 1671 (./etrip.out) ( Warning: end of semi simple group (level 3) entered at line 433 of a dif ferent file @@ -1423,7 +1421,7 @@ you left one out. Proceed, with fingers crossed. ### math mode entered at line 524 \mathord .\fam1 r -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord @@ -1447,7 +1445,7 @@ this will be denominator of: ### math mode entered at line 517 \mathord .\fam1 r -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord @@ -1494,7 +1492,7 @@ l.525 ... \over r\showlists ### math mode entered at line 517 \mathord .\fam1 r -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord @@ -1542,7 +1540,7 @@ l.526 ... \right]\showlists ../.\fam1 r ..\right"162362 .\right"162362 -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\left"161361 \\mathord @@ -2717,9 +2715,9 @@ since the result is out of range. Expr fraction rounding 3 OK [1] -Memory usage before: 53&322; after: 44&322; still untouched: 835 +Memory usage before: 53&323; after: 44&323; still untouched: 834 [1] -Memory usage before: 53&322; after: 44&322; still untouched: 835 +Memory usage before: 53&323; after: 44&323; still untouched: 834 Checking \mutoglue and \gluetomu: ! You can't use `\mutoglue' in vertical mode. l.905 \mutoglue @@ -4418,9 +4416,9 @@ Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 ) Here is how much of TeX's memory you used: - 19 strings out of 1809 - 145 string characters out of 7742 - 3164 words of memory out of 3999 + 19 strings out of 1808 + 145 string characters out of 7702 + 3165 words of memory out of 3999 409 multiletter control sequences out of 15000+0 3796 words of font info for 5 fonts, out of 20000 for 75 10 hyphenation exceptions out of 659 diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.typ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ index 1d6d8716829..c2acaaf3bf8 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.typ +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ @@ -1,4 +1,4 @@ -This is DVItype, Version 3.6 (TeX Live 2014) +This is DVItype, Version 3.6 (TeX Live 2023) Options selected: Starting page = *.*.*.*.*.*.*.*.*.* Maximum number of pages = 1000000 @@ -6,7 +6,7 @@ Options selected: Resolution = 72.27000000 pixels per inch numerator/denominator=25400000/473628672 magnification=1000; 0.00001526 pixels per DVI unit -' TeX output 2014.01.22:1125' +' TeX output 2023.01.22:1125' 42: beginning of page 1.0.0.0.0.0.0.0.0.0 87: eop diff --git a/Build/source/texk/web2c/etexdir/etrip/etripin.log b/Build/source/texk/web2c/etexdir/etrip/etripin.log index af805ca4c67..9fa35b916e9 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etripin.log +++ b/Build/source/texk/web2c/etexdir/etrip/etripin.log @@ -1,8 +1,8 @@ -This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 +This is e-TeX, Version 3.141592653-2.6 (TeX Live 2023) (INITEX) 22 JAN 2023 11:25 entering extended mode ***etrip (./etrip.tex -This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. +This is the e-Trip test [2021-01-28] for e-TeX v3.141592653-2.6. (You are using e-TeX version/revision 2.6) e-IniTeX: Assigning category codes, tracing switches, other codes, definitions for e-VirTeX e-Trip test run, constants and registers, @@ -23,9 +23,9 @@ Proceed; I'll ignore the character I just read. enable e-TeX enhancements (TeXXeT), prepare saved items (not to be dumped), everyjob ...dumped. ) Beginning to dump on file etrip.fmt - (preloaded format=etrip 2014.1.22) -1491 strings of total length 26258 -281 memory locations dumped; current usage is 36&167 + (preloaded format=etrip 2023.1.22) +1492 strings of total length 26298 +282 memory locations dumped; current usage is 36&168 408 multiletter control sequences \font\nullfont=nullfont \font\trip=etrip diff --git a/Build/source/texk/web2c/etexdir/etriptest.test b/Build/source/texk/web2c/etexdir/etriptest.test index 588f38b7e79..5b8807003eb 100755 --- a/Build/source/texk/web2c/etexdir/etriptest.test +++ b/Build/source/texk/web2c/etexdir/etriptest.test @@ -1,5 +1,6 @@ #! /bin/sh -vx # $Id$ +# Copyright 2023 Japanese TeX Development Community <issue@texjp.org> # Copyright 2017 Karl Berry <tex-live@tug.org> # Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. @@ -19,6 +20,57 @@ TEXMFCNF=$etestdir; export TEXMFCNF rm -rf etripdir mkdir etripdir cd etripdir +mkdir -p a b + +# TeX Live generic +cat >filter <<-\_EOF + /^\*\* \&trip trip/d + /^\*\*entering extended mode/d + s,^(trip\.tex ##,**(./trip.tex ##, + s,^## (\./trip\.tex,**(./trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// + s/(preloaded format=.*tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342.../down4 639342208/ + s/y4 2039217../y4 203921760/ + s/y0 2039217../y0 203921760/ + _EOF + +# eTeX +cat >>filter <<-\_EOF + s/This is .*TeX,/This is *TeX,/ + s/ Version 3\.141592653[^(]*(/ Version 3.141592653* (/ + s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / + s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / + s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ + _EOF +cat >filter1 <<-\_EOF + :l + N + $!b l + s/ inside a group at level 1).*bottom level/ inside a group at level 1)/ + _EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" @@ -51,7 +103,7 @@ diff $testdir/tripin.log ctripin.log # May as well test non-ini second time through. $_etex --progname=etex <$testdir/trip2.in >ctrip.fot mv trip.log ctrip.log -diff $testdir/trip.fot ctrip.fot +#diff $testdir/trip.fot ctrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. @@ -61,7 +113,13 @@ mv tripos.tex ctripos.tex diff $testdir/tripos.tex ctripos.tex eval $_dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/$f + sed -f filter c$f >b/$f + diff a/$f b/$f || is_OK=false +done mv trip.fmt ctrip.fmt @@ -80,7 +138,7 @@ diff ctripin.log xtripin.log # May as well test non-ini second time through. $_etex --progname=etex <$etestdir/trip2.in >xtrip.fot mv trip.log xtrip.log -diff ctrip.fot xtrip.fot +#diff ctrip.fot xtrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. @@ -90,7 +148,13 @@ mv tripos.tex xtripos.tex diff $testdir/tripos.tex xtripos.tex eval $_dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 -$DIFF $DIFFFLAGS ctrip.typ xtrip.typ +#$DIFF $DIFFFLAGS ctrip.typ xtrip.typ + +for f in trip.fot trip.typ; do + sed -f filter c$f >a/x$f + sed -f filter x$f | sed -f filter1 >b/x$f + diff a/x$f b/x$f || is_OK=false +done mv trip.fmt xtrip.fmt @@ -117,7 +181,7 @@ diff $etestdir/etripin.log etripin.log # May as well test non-ini second time through. $_etex --progname=etex <$etestdir/etrip3.in >etrip.fot -diff $etestdir/etrip.fot etrip.fot +#diff $etestdir/etrip.fot etrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. @@ -126,7 +190,13 @@ $DIFF $DIFFFLAGS $etestdir/etrip.log etrip.log diff $etestdir/etrip.out etrip.out eval $_dvitype $dvitype_args etrip.dvi >etrip.typ || exit 1 -$DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ +#$DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $etestdir/e$f >a/e$f + sed -f filter e$f >b/e$f + diff a/e$f b/e$f || is_OK=false +done $is_OK || { echo ">>> There were some errors." >&2 diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index ea9bf803ae1..ebb45171759 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -3,6 +3,9 @@ * wcfname.test: Add test for file names with over-BMP (4byte UTF-8). https://tug.org/pipermail/tex-live/2023-November/049685.html + * eptriptest.test, euptriptest.test: + Check diffs of trip.{fot,typ} with ignoring trivial changes + in trip tests. 2023-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp> diff --git a/Build/source/texk/web2c/euptexdir/eptriptest.test b/Build/source/texk/web2c/euptexdir/eptriptest.test index e99513fdc37..a3416f09207 100755 --- a/Build/source/texk/web2c/euptexdir/eptriptest.test +++ b/Build/source/texk/web2c/euptexdir/eptriptest.test @@ -1,6 +1,6 @@ #! /bin/sh -vx # $Id$ -# Copyright 2022-2023 Japanese TeX Development Community <issue@texjp.org> +# Copyright 2023 Japanese TeX Development Community <issue@texjp.org> # Copyright 2017-2018 Karl Berry <tex-live@tug.org> # Copyright 2011-2014 Peter Breitenlohner <tex-live@tug.org> # Copyright 2010 Hironori Kitagawa <tex-live@tug.org> @@ -24,6 +24,58 @@ TEXMFCNF=$eptestdir; export TEXMFCNF rm -rf eupptripdir mkdir eupptripdir cd eupptripdir +mkdir -p a b + +# TeX Live generic +cat >filter <<-\_EOF + /^\*\* \&trip trip/d + /^\*\*entering extended mode/d + s,^(trip\.tex ##,**(./trip.tex ##, + s,^## (\./trip\.tex,**(./trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// + s/(preloaded format=.*tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342.../down4 639342208/ + s/y4 2039217../y4 203921760/ + s/y0 2039217../y0 203921760/ + _EOF + +# epTeX +cat >>filter <<-\_EOF + s/This is .*TeX,/This is *TeX,/ + s/(utf8[^)]*) // + s/ Version 3\.141592653[^(]*(/ Version 3.141592653* (/ + s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / + s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / + s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ + _EOF +cat >filter1 <<-\_EOF + :l + N + $!b l + s/ inside a group at level 1).*bottom level/ inside a group at level 1)/ + _EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" @@ -62,17 +114,23 @@ diff $testdir/tripin.log cptripin.log rm -f trip.log $_euptex --kanji-internal=euc --progname=eptex <$testdir/trip2.in >cptrip.fot sed "$P_SED1;$P_SED2" trip.log > cptrip.log -diff $testdir/trip.fot cptrip.fot +#diff $testdir/trip.fot cptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log mv tripos.tex cptripos.tex diff $testdir/tripos.tex cptripos.tex eval $_dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/$f + sed -f filter cp$f >b/$f + diff a/$f b/$f || is_OK=false +done mv trip.fmt ctrip.fmt @@ -93,17 +151,23 @@ diff $testdir/tripin.log xptripin.log rm -f trip.log $_euptex --kanji-internal=euc --progname=eptex <$etestdir/trip2.in >xptrip.fot sed "$P_SED1;$P_SED2" trip.log > xptrip.log -diff $testdir/trip.fot xptrip.fot +#diff $testdir/trip.fot xptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log mv tripos.tex xptripos.tex diff $testdir/tripos.tex xptripos.tex eval $_dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/x$f + sed -f filter xp$f | sed -f filter1 >b/x$f + diff a/x$f b/x$f || is_OK=false +done mv trip.fmt xtrip.fmt @@ -131,7 +195,7 @@ diff $etestdir/etripin.log eptripin.log # May as well test non-ini second time through. $_euptex --kanji-internal=euc --progname=eptex <$etestdir/etrip3.in >eptrip.fot sed "$P_SED1;$P_SED2" etrip.log > eptrip.log -diff $etestdir/etrip.fot eptrip.fot +#diff $etestdir/etrip.fot eptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. @@ -141,7 +205,13 @@ mv etrip.out eptrip.out diff $etestdir/etrip.out eptrip.out eval $_dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 -$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ +#$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $etestdir/e$f >a/e$f + sed -f filter ep$f >b/e$f + diff a/e$f b/e$f || is_OK=false +done $is_OK || { echo ">>> There were some errors." >&2 diff --git a/Build/source/texk/web2c/euptexdir/euptriptest.test b/Build/source/texk/web2c/euptexdir/euptriptest.test index 848f6bb425b..d6a1239ded3 100755 --- a/Build/source/texk/web2c/euptexdir/euptriptest.test +++ b/Build/source/texk/web2c/euptexdir/euptriptest.test @@ -1,5 +1,6 @@ #! /bin/sh -vx # $Id$ +# Copyright 2023 Japanese TeX Development Community <issue@texjp.org> # Copyright 2017-2018 Karl Berry <tex-live@tug.org> # Copyright 2011-2014 Peter Breitenlohner <tex-live@tug.org> # Copyright 2010 Hironori Kitagawa <tex-live@tug.org> @@ -24,6 +25,58 @@ TEXMFCNF=$euptestdir; export TEXMFCNF rm -rf euptripdir mkdir euptripdir cd euptripdir +mkdir -p a b + +# TeX Live generic +cat >filter <<-\_EOF + /^\*\* \&trip trip/d + /^\*\*entering extended mode/d + s,^(trip\.tex ##,**(./trip.tex ##, + s,^## (\./trip\.tex,**(./trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// + s/(preloaded format=.*tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342.../down4 639342208/ + s/y4 2039217../y4 203921760/ + s/y0 2039217../y0 203921760/ + _EOF + +# epTeX +cat >>filter <<-\_EOF + s/This is .*TeX,/This is *TeX,/ + s/(utf8[^)]*) // + s/ Version 3\.141592653[^(]*(/ Version 3.141592653* (/ + s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / + s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / + s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ + _EOF +cat >filter1 <<-\_EOF + :l + N + $!b l + s/ inside a group at level 1).*bottom level/ inside a group at level 1)/ + _EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" @@ -62,17 +115,23 @@ diff $testdir/tripin.log cuptripin.log rm -f trip.log $_euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot sed "$P_SED1;$P_SED2" trip.log > cuptrip.log -diff $testdir/trip.fot cuptrip.fot +#diff $testdir/trip.fot cuptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log mv tripos.tex cuptripos.tex diff $testdir/tripos.tex cuptripos.tex eval $_dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/$f + sed -f filter cup$f >b/$f + diff a/$f b/$f || is_OK=false +done mv trip.fmt ctrip.fmt @@ -93,17 +152,23 @@ diff $testdir/tripin.log xuptripin.log rm -f trip.log $_euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot sed "$P_SED1;$P_SED2" trip.log > xuptrip.log -diff $testdir/trip.fot xuptrip.fot +#diff $testdir/trip.fot xuptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log mv tripos.tex xuptripos.tex diff $testdir/tripos.tex xuptripos.tex eval $_dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/x$f + sed -f filter xup$f | sed -f filter1 >b/x$f + diff a/x$f b/x$f || is_OK=false +done mv trip.fmt xtrip.fmt @@ -131,7 +196,7 @@ diff $etestdir/etripin.log euptripin.log # May as well test non-ini second time through. $_euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot sed "$P_SED1;$P_SED2" etrip.log > euptrip.log -diff $etestdir/etrip.fot euptrip.fot +#diff $etestdir/etrip.fot euptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. @@ -141,7 +206,13 @@ mv etrip.out euptrip.out diff $etestdir/etrip.out euptrip.out eval $_dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 -$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ +#$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $etestdir/e$f >a/e$f + sed -f filter eup$f >b/e$f + diff a/e$f b/e$f || is_OK=false +done $is_OK || { echo ">>> There were some errors." >&2 diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 890d153de6e..c6d9a558df4 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,9 @@ +2023-11-24 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * ptriptest.test: + Check diffs of trip.{fot,typ} with ignoring trivial changes + in trip tests. + 2023-09-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> * ptex-base.ch: Support more than 256 different glue/kern. diff --git a/Build/source/texk/web2c/ptexdir/ptriptest.test b/Build/source/texk/web2c/ptexdir/ptriptest.test index 35099794b3d..330e5d43885 100755 --- a/Build/source/texk/web2c/ptexdir/ptriptest.test +++ b/Build/source/texk/web2c/ptexdir/ptriptest.test @@ -1,5 +1,6 @@ #! /bin/sh -vx # $Id$ +# Copyright 2023 Japanese TeX Development Community <issue@texjp.org> # Copyright 2017-2018 Karl Berry <tex-live@tug.org> # Copyright 2010-2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. @@ -21,6 +22,50 @@ TEXMFCNF=$ptestdir; export TEXMFCNF rm -rf ptripdir mkdir ptripdir cd ptripdir +mkdir -p a b + +# TeX Live generic +cat >filter <<-\_EOF + s,^\*\*(\./trip\.tex ##,** \&trip trip \ + (trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// + s/(preloaded format=.*tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342.../down4 639342208/ + s/y4 2039217../y4 203921760/ + s/y0 2039217../y0 203921760/ + _EOF + +# pTeX +cat >>filter <<-\_EOF + s/This is .*TeX,/This is *TeX,/ + s/ (utf8[^)]*)/ / + s/ Version 3\.141592653-[^ ]* / Version 3.141592653/ + s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / + s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / + s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ + _EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" @@ -53,23 +98,29 @@ if test ! -s trip.fmt; then exit 1 fi sed "$P_SED1" trip.log > ptripin.log || exit 1 -diff $testdir/tripin.log ptripin.log +$DIFF $testdir/tripin.log ptripin.log # May as well test non-ini second time through. rm -f trip.log $_ptex --progname=ptex <$testdir/trip2.in >ptrip.fot sed "$P_SED1;$P_SED2" trip.log > ptrip.log -diff $testdir/trip.fot ptrip.fot +#diff $testdir/trip.fot ptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log ptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log ptrip.log mv tripos.tex ptripos.tex diff $testdir/tripos.tex ptripos.tex || is_OK=false eval $_dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/$f + sed -f filter p$f >b/$f + diff a/$f b/$f || is_OK=false +done $is_OK || { echo ">>> There were some errors." >&2 diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 883eeb919b1..aa01c88c675 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -3,6 +3,9 @@ * wcfname.test: Add test for file names with over-BMP (4byte UTF-8). https://tug.org/pipermail/tex-live/2023-November/049685.html + * ptriptest.test, uptriptest.test: + Check diffs of trip.{fot,typ} with ignoring trivial changes + in trip tests. 2023-09-21 Hironobu Yamashita <h.y.acetaminophen@gmail.com> diff --git a/Build/source/texk/web2c/uptexdir/ptriptest.test b/Build/source/texk/web2c/uptexdir/ptriptest.test index aef48daa3e9..37d1bd5d29f 100755 --- a/Build/source/texk/web2c/uptexdir/ptriptest.test +++ b/Build/source/texk/web2c/uptexdir/ptriptest.test @@ -1,6 +1,6 @@ #! /bin/sh -vx # $Id$ -# Copyright 2022-2023 Japanese TeX Development Community <issue@texjp.org> +# Copyright 2023 Japanese TeX Development Community <issue@texjp.org> # Copyright 2017-2018 Karl Berry <tex-live@tug.org> # Copyright 2010-2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. @@ -22,6 +22,50 @@ TEXMFCNF=$ptestdir; export TEXMFCNF rm -rf upptripdir mkdir upptripdir cd upptripdir +mkdir -p a b + +# TeX Live generic +cat >filter <<-\_EOF + s,^\*\*(\./trip\.tex ##,** \&trip trip \ + (trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// + s/(preloaded format=.*tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342.../down4 639342208/ + s/y4 2039217../y4 203921760/ + s/y0 2039217../y0 203921760/ + _EOF + +# pTeX +cat >>filter <<-\_EOF + s/This is .*TeX,/This is *TeX,/ + s/ (utf8[^)]*)/ / + s/ Version 3\.141592653-[^ ]* / Version 3.141592653/ + s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / + s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / + s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ + _EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" @@ -54,13 +98,13 @@ if test ! -s trip.fmt; then exit 1 fi sed "$P_SED1" trip.log > ptripin.log || exit 1 -diff $testdir/tripin.log ptripin.log +$DIFF $testdir/tripin.log ptripin.log # May as well test non-ini second time through. rm -f trip.log $_uptex --kanji-internal=euc --progname=ptex <$testdir/trip2.in >ptrip.fot sed "$P_SED1;$P_SED2" trip.log > ptrip.log -diff $testdir/trip.fot ptrip.fot +#diff $testdir/trip.fot ptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. @@ -70,7 +114,13 @@ mv tripos.tex ptripos.tex diff $testdir/tripos.tex ptripos.tex || is_OK=false eval $_dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/$f + sed -f filter p$f >b/$f + diff a/$f b/$f || is_OK=false +done $is_OK || { echo ">>> There were some errors." >&2 diff --git a/Build/source/texk/web2c/uptexdir/uptriptest.test b/Build/source/texk/web2c/uptexdir/uptriptest.test index 85055eb40c8..0b2af38552a 100755 --- a/Build/source/texk/web2c/uptexdir/uptriptest.test +++ b/Build/source/texk/web2c/uptexdir/uptriptest.test @@ -1,5 +1,6 @@ #! /bin/sh -vx # $Id$ +# Copyright 2023 Japanese TeX Development Community <issue@texjp.org> # Copyright 2017-2018 Karl Berry <tex-live@tug.org> # Copyright 2011-2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. @@ -21,6 +22,50 @@ TEXMFCNF=$uptestdir; export TEXMFCNF rm -rf uptripdir mkdir uptripdir cd uptripdir +mkdir -p a b + +# TeX Live generic +cat >filter <<-\_EOF + s,^\*\*(\./trip\.tex ##,** \&trip trip \ + (trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// + s/(preloaded format=.*tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342.../down4 639342208/ + s/y4 2039217../y4 203921760/ + s/y0 2039217../y0 203921760/ + _EOF + +# pTeX +cat >>filter <<-\_EOF + s/This is .*TeX,/This is *TeX,/ + s/ (utf8[^)]*)/ / + s/ Version 3\.141592653-[^ ]* / Version 3.141592653/ + s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / + s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / + s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ + _EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" @@ -53,23 +98,29 @@ if test ! -s trip.fmt; then exit 1 fi sed "$P_SED1" trip.log > uptripin.log || exit 1 -diff $testdir/tripin.log uptripin.log +$DIFF $testdir/tripin.log uptripin.log # May as well test non-ini second time through. rm -f trip.log $_uptex --progname=uptex <$testdir/trip2.in >uptrip.fot sed "$P_SED1;$P_SED2" trip.log > uptrip.log -diff $testdir/trip.fot uptrip.fot +#diff $testdir/trip.fot uptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log uptrip.log +$DIFF $DIFFFLAGS $testdir/trip.log uptrip.log mv tripos.tex uptripos.tex diff $testdir/tripos.tex uptripos.tex || is_OK=false eval $_dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ +#$DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ + +for f in trip.fot trip.typ; do + sed -f filter $testdir/$f >a/$f + sed -f filter up$f >b/$f + diff a/$f b/$f || is_OK=false +done $is_OK || { echo ">>> There were some errors." >&2 |