From 315d8e3bc3955311b93346d23581533cca50b37b Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Fri, 24 Nov 2023 10:57:33 +0000 Subject: uptex: Update test for Windows git-svn-id: svn://tug.org/texlive/trunk@68955 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/uptexdir/ChangeLog | 1 + Build/source/texk/web2c/uptexdir/gkhuge.test | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'Build/source/texk/web2c') diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index aa01c88c675..39b3fe94a15 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -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 diff --git a/Build/source/texk/web2c/uptexdir/gkhuge.test b/Build/source/texk/web2c/uptexdir/gkhuge.test index b3d8cdc3e64..e8fe12c3de5 100755 --- a/Build/source/texk/web2c/uptexdir/gkhuge.test +++ b/Build/source/texk/web2c/uptexdir/gkhuge.test @@ -13,6 +13,14 @@ test -d uptests || mkdir -p uptests 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 @@ for font in gkhugeng; do # 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 -- cgit v1.2.3