diff options
-rw-r--r-- | Build/source/texk/.gitattributes | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 6 | ||||
-rwxr-xr-x | Build/source/texk/web2c/mftraptest.test | 15 | ||||
-rwxr-xr-x | Build/source/texk/web2c/triptest.test | 5 |
4 files changed, 23 insertions, 5 deletions
diff --git a/Build/source/texk/.gitattributes b/Build/source/texk/.gitattributes index 51619d76aff..f41e66cb89b 100644 --- a/Build/source/texk/.gitattributes +++ b/Build/source/texk/.gitattributes @@ -14,6 +14,8 @@ *.opl text eol=lf *.ovp text eol=lf *.out text eol=lf +*.log text eol=lf +*.typ text eol=lf # for dvi2tty *.tty text eol=lf diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index a1073beb609..b516eba98b0 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2023-08-20 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * mftraptest.test, + * triptest.test: Filter Web2C year in banner. + Make easier to test on Windows. + 2023-08-19 Andreas Scherer <https://ascherer.github.io> * ctangleboot.cin: CWEB 4.10 release. diff --git a/Build/source/texk/web2c/mftraptest.test b/Build/source/texk/web2c/mftraptest.test index 29393f24a3d..61b79a777ac 100755 --- a/Build/source/texk/web2c/mftraptest.test +++ b/Build/source/texk/web2c/mftraptest.test @@ -4,6 +4,14 @@ # Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +# pre-generated test results in the repository are stored in LF +# but the output might be written in CRLF on some platform. +# if 'diff --strip-trailing-cr' is available, exploit it. +# (useful for tests on win32 binaries run on MSYS shell) +DIFF="diff" +$DIFF --strip-trailing-cr $0 $0 \ + && DIFF="diff --strip-trailing-cr" || echo + LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE testdir=$abs_srcdir/triptrap @@ -22,6 +30,7 @@ cat >filter <<-\_EOF s,^\*\*(trap\.mf,** \&trap trap \ (trap.mf, s/ (TeX Live 20[^)]*)// + s/ (Web2C 202[3-9])// s/base=trap [^)][^)]*)/base=trap)/ s/) [0-9A-Z: ]*$/)/ s/usage [1-9][0-9&]* ([1-9][0-9&]* still/usage XX\&XX (YYY\&YYYYY still/ @@ -71,11 +80,11 @@ diff $testdir/mftrap.log mftrap.log diff $testdir/mftrap.pl mftrap.pl || is_OK=false ../gftype -m -i ./trap.72270gf >trap.typ || exit 1 -diff $testdir/trap.typ trap.typ +$DIFF $testdir/trap.typ trap.typ for f in mftrapin.log mftrap.fot mftrap.log trap.typ; do - sed $testdir/$f -f filter >a/$f - sed $f -f filter >b/$f + sed -f filter $testdir/$f >a/$f + sed -f filter $f >b/$f diff a/$f b/$f || is_OK=false done diff --git a/Build/source/texk/web2c/triptest.test b/Build/source/texk/web2c/triptest.test index 90ba37b4929..fda2c50e3d6 100755 --- a/Build/source/texk/web2c/triptest.test +++ b/Build/source/texk/web2c/triptest.test @@ -21,6 +21,7 @@ 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: ]*$/)/ @@ -90,8 +91,8 @@ eval ../dvitype $dvitype_args trip.dvi >trip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ trip.typ for f in tripin.log trip.fot trip.log trip.typ; do - sed $testdir/$f -f filter >a/$f - sed $f -f filter >b/$f + sed -f filter $testdir/$f >a/$f + sed -f filter $f >b/$f diff a/$f b/$f || is_OK=false done |