texlive[67980] Build/source/texk: triptest.test: Filter Web2C year in

[commits+takuji at tug.org]

Revision: 67980
          http://tug.org/svn/texlive?view=revision&revision=67980
Author:   takuji
Date:     2023-08-19 17:10:16 +0200 (Sat, 19 Aug 2023)
Log Message:
-----------
triptest.test: Filter Web2C year in banner

Modified Paths:
--------------
    trunk/Build/source/texk/.gitattributes
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/mftraptest.test
    trunk/Build/source/texk/web2c/triptest.test

Modified: trunk/Build/source/texk/.gitattributes
===================================================================
--- trunk/Build/source/texk/.gitattributes	2023-08-19 14:54:15 UTC (rev 67979)
+++ trunk/Build/source/texk/.gitattributes	2023-08-19 15:10:16 UTC (rev 67980)
@@ -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

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2023-08-19 14:54:15 UTC (rev 67979)
+++ trunk/Build/source/texk/web2c/ChangeLog	2023-08-19 15:10:16 UTC (rev 67980)
@@ -1,3 +1,9 @@
+2023-08-20  TANAKA Takuji  <ttk at 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.

Modified: trunk/Build/source/texk/web2c/mftraptest.test
===================================================================
--- trunk/Build/source/texk/web2c/mftraptest.test	2023-08-19 14:54:15 UTC (rev 67979)
+++ trunk/Build/source/texk/web2c/mftraptest.test	2023-08-19 15:10:16 UTC (rev 67980)
@@ -4,6 +4,14 @@
 # Copyright 2009-2014 Peter Breitenlohner <tex-live at 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 @@
 	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.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
 

Modified: trunk/Build/source/texk/web2c/triptest.test
===================================================================
--- trunk/Build/source/texk/web2c/triptest.test	2023-08-19 14:54:15 UTC (rev 67979)
+++ trunk/Build/source/texk/web2c/triptest.test	2023-08-19 15:10:16 UTC (rev 67980)
@@ -21,6 +21,7 @@
 	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 @@
 $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