texlive[68955] Build/source/texk/web2c/uptexdir: uptex: Update test

[commits+takuji at tug.org]

Revision: 68955
          https://tug.org/svn/texlive?view=revision&revision=68955
Author:   takuji
Date:     2023-11-24 11:57:33 +0100 (Fri, 24 Nov 2023)
Log Message:
-----------
uptex: Update test for Windows

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/uptexdir/ChangeLog
    trunk/Build/source/texk/web2c/uptexdir/gkhuge.test

Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2023-11-24 10:57:29 UTC (rev 68954)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2023-11-24 10:57:33 UTC (rev 68955)
@@ -6,6 +6,7 @@
 	* ptriptest.test, uptriptest.test:
 	Check diffs of trip.{fot,typ} with ignoring trivial changes
 	in trip tests.
+	* gkhuge.test: Update test for Windows.
 
 2023-09-21  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
 

Modified: trunk/Build/source/texk/web2c/uptexdir/gkhuge.test
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/gkhuge.test	2023-11-24 10:57:29 UTC (rev 68954)
+++ trunk/Build/source/texk/web2c/uptexdir/gkhuge.test	2023-11-24 10:57:33 UTC (rev 68955)
@@ -13,6 +13,14 @@
 TEXMFCNF=$srcdir/../kpathsea
 export TEXMFCNF
 
+DIFF="diff"
+# 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 --strip-trailing-cr $0 $0 \
+  && DIFF="diff --strip-trailing-cr" || echo
+
 # Test inputs
 testdir=$srcdir/uptexdir/tests
 
@@ -37,7 +45,7 @@
   # web2c/pltotf.ch change 2017-09-10, due to overflow
   $_uptftopl $testdir/$font.tfm uptests/y$font.pl \
     2>uptests/y$font.err && exit 1 || echo
-  diff $testdir/$font.err uptests/y$font.err && echo || exit 2
+  $DIFF $testdir/$font.err uptests/y$font.err && echo || exit 2
 
 done