diff options
Diffstat (limited to 'Build/source/texk/web2c')
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 7 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/mftraptest | 9 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/triptest | 7 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/triptrap-sh | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/triptrap/README | 28 |
5 files changed, 35 insertions, 18 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index aaeceeb1271..6e18add63ab 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2014-02-23 Karl Berry <karl@tug.org> + + * mftraptest, + * triptest, + * triptrap/README: a bit more discussion of acceptable diffs, + and use *** more emphatic text if the tests fail. + 2014-02-05 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Add @LUAJIT_RULE@. diff --git a/Build/source/texk/web2c/mftraptest b/Build/source/texk/web2c/mftraptest index ce098f77cc5..74567ab180e 100755 --- a/Build/source/texk/web2c/mftraptest +++ b/Build/source/texk/web2c/mftraptest @@ -4,14 +4,16 @@ # You may freely use, modify and/or distribute this file. testdir=$abs_srcdir/triptrap - TEXMFCNF=$testdir; export TEXMFCNF rm -rf trapdir mkdir trapdir cd trapdir - mkdir a b + +# See triptrap/README for explanation of why we believe these diffs are ok, +# notably including the capsule numbers. + cat >filter <<-\_EOF s,^\*\*(trap\.mf,** \&trap trap \ (trap.mf, @@ -66,7 +68,6 @@ done $is_OK && { echo ">>> All differences are acceptable." >&2 } || { - echo ">>> There were some errors." >&2 + echo "*** Error(s) found in mf trap test, investigate!" >&2 exit 1 } - diff --git a/Build/source/texk/web2c/triptest b/Build/source/texk/web2c/triptest index cd786c81263..41663d191b4 100755 --- a/Build/source/texk/web2c/triptest +++ b/Build/source/texk/web2c/triptest @@ -4,13 +4,15 @@ # You may freely use, modify and/or distribute this file. testdir=$abs_srcdir/triptrap - TEXMFCNF=$testdir; export TEXMFCNF rm -rf tripdir mkdir tripdir cd tripdir mkdir a b + +# See triptrap/README for explanation of why we believe these diffs are ok. + cat >filter <<-\_EOF s,^\*\*(\./trip\.tex ##,** \&trip trip \ (trip.tex ##, @@ -81,7 +83,6 @@ done $is_OK && { echo ">>> All differences are acceptable." >&2 } || { - echo ">>> There were some errors." >&2 + echo "*** Error(s) found in trip test, investigate!" >&2 exit 1 } - diff --git a/Build/source/texk/web2c/triptrap-sh b/Build/source/texk/web2c/triptrap-sh index 37338cc2ffb..67ee48d4eaf 100755 --- a/Build/source/texk/web2c/triptrap-sh +++ b/Build/source/texk/web2c/triptrap-sh @@ -1,7 +1,7 @@ #! /bin/sh # shell script to run TRIP and TRAP tests and create diffs. # -# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, diff --git a/Build/source/texk/web2c/triptrap/README b/Build/source/texk/web2c/triptrap/README index a129fb893a9..4a3b6e1909a 100644 --- a/Build/source/texk/web2c/triptrap/README +++ b/Build/source/texk/web2c/triptrap/README @@ -13,15 +13,24 @@ generated on my development machine. tripman.tex, trapman.tex, and mptrap.readme explain precisely what is and is not acceptable. Generally, for trap and MetaPost trap, dates and times, a number of constants and one call to BLANKRECTANGLE will be different. -For trip, again some constants will be different. The floating point - numbers in glue set ratios may be slightly different (but all the box - dimensions must be the same), and the y* and down* commands in the - trip.dvi file may be somewhat different. The hyphenation exceptions - are different because the exception routine now does not count - identical hyphenations separately, i.e., \hyphenation{a-a a-a} only - generates one exception in the table. See the messages below for why - this is a good/necessary thing (if the hyphenation exception table is - to be dynamic at all). +For trip: + - Some compile-time constants will be different. + - The floating point numbers in glue set ratios may be slightly + different (but all the box dimensions must be the same). + - The y* and down* commands in the trip.dvi file may be somewhat + different. + These three kinds of differences are allowed by the trip manual. + + - The hyphenation exceptions are different because the exception + routine now does not count identical hyphenations separately, i.e., + \hyphenation{a-a a-a} only generates one exception in the table. See + the messages below for why this is a good/necessary thing (if the + hyphenation exception table is to be dynamic at all). Knuth has said + this discrepancy is ok. + +For trap, additionally, the capsule numbers will be different. We +believe this is because the master trap.log was not updated completed +after the 2.7182818 (2014) tune-up, and have asked Knuth to review. texmf.cnf -- sets up various constants the way the tests want them. Not all constants can be changed, alas, but this suffices to avoid building @@ -93,4 +102,3 @@ twice. [...] Wayne - |