texlive[68158] Build/source/texk/web2c/omegafonts: omegafonts: Update

[commits+takuji at tug.org]

Revision: 68158
          http://tug.org/svn/texlive?view=revision&revision=68158
Author:   takuji
Date:     2023-09-03 13:26:45 +0200 (Sun, 03 Sep 2023)
Log Message:
-----------
omegafonts: Update tests for Windows

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/omegafonts/ChangeLog
    trunk/Build/source/texk/web2c/omegafonts/check.test
    trunk/Build/source/texk/web2c/omegafonts/repeat.test
    trunk/Build/source/texk/web2c/omegafonts/selectfont.test

Modified: trunk/Build/source/texk/web2c/omegafonts/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2023-09-03 11:26:37 UTC (rev 68157)
+++ trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2023-09-03 11:26:45 UTC (rev 68158)
@@ -1,3 +1,7 @@
+2023-09-03  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* {check,repeat,selectfont}.test: Update tests for Windows.
+
 2023-08-26  Karl Berry  <karl at freefriends.org>
 
 	* ligkern.test: protect against $rc being defined in the environment.

Modified: trunk/Build/source/texk/web2c/omegafonts/check.test
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/check.test	2023-09-03 11:26:37 UTC (rev 68157)
+++ trunk/Build/source/texk/web2c/omegafonts/check.test	2023-09-03 11:26:45 UTC (rev 68158)
@@ -8,6 +8,14 @@
 ExeExt=${ExeExt:-}
 _omfonts=$BinDir/omfonts$ExeExt
 
+# 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
+
 tests=tests
 
 test -d $tests || mkdir -p $tests
@@ -30,6 +38,6 @@
 $_omfonts -ofm2opl $tests/xchecked >$tests/xchecked.opl || rc=4
 
 echo && echo "*** diff checked.opl xchecked.opl"
-diff $srcdir/$tests/checked.opl $tests/xchecked.opl || rc=5
+$DIFF $srcdir/$tests/checked.opl $tests/xchecked.opl || rc=5
 
 exit $rc

Modified: trunk/Build/source/texk/web2c/omegafonts/repeat.test
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/repeat.test	2023-09-03 11:26:37 UTC (rev 68157)
+++ trunk/Build/source/texk/web2c/omegafonts/repeat.test	2023-09-03 11:26:45 UTC (rev 68158)
@@ -13,10 +13,10 @@
 test -d $tests || mkdir -p $tests
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -opl2ofm -verbose $srcdir/$tests/repeat $tests/xrepeated || exit 1
+  $_omfonts -opl2ofm -verbose $srcdir/$tests/repeat $tests/xrepeated || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -ofm2opl -verbose $tests/xrepeated $tests/xrepeated || exit 2
+  $_omfonts -ofm2opl -verbose $tests/xrepeated $tests/xrepeated || exit 2
 
 diff $srcdir/$tests/repeated.opl $tests/xrepeated.opl || exit 3
 

Modified: trunk/Build/source/texk/web2c/omegafonts/selectfont.test
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/selectfont.test	2023-09-03 11:26:37 UTC (rev 68157)
+++ trunk/Build/source/texk/web2c/omegafonts/selectfont.test	2023-09-03 11:26:45 UTC (rev 68158)
@@ -8,6 +8,14 @@
 ExeExt=${ExeExt:-}
 _omfonts=$BinDir/omfonts$ExeExt
 
+# 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
+
 tests=tests
 
 test -d $tests || mkdir -p $tests
@@ -35,6 +43,6 @@
 
 $_omfonts -ovf2ovp -verbose $tests/sample2 sample2 >$tests/xsample2.out || rc=9
 
-diff $srcdir/$tests/sample.out $tests/xsample2.out || rc=10
+$DIFF $srcdir/$tests/sample.out $tests/xsample2.out || rc=10
 
 exit $rc