omegafonts: Make easier to test on Windows

git-svn-id: svn://tug.org/texlive/trunk@67982 c570f23f-e606-0410-a88d-b1316a301751

22 files changed, 314 insertions, 214 deletions

diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index ee052d40cf9..300919c484e 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-19  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* {bad,charwd,check,help,level1,ligkern,ofonts,
+	omfonts,overbmp,realnum,repeat,selectfont,
+	shorten,specialhex,version,yannis}.test:
+	Make easier to test on Windows.
+
 2023-03-09  Karl Berry  <karl@tug.org>
 
 	* TL'23 release.
diff --git a/Build/source/texk/web2c/omegafonts/bad.test b/Build/source/texk/web2c/omegafonts/bad.test
index 349e6f28d01..77662ee5d6b 100755
--- a/Build/source/texk/web2c/omegafonts/bad.test
+++ b/Build/source/texk/web2c/omegafonts/bad.test
@@ -4,24 +4,33 @@
 # Copyright 2015 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
+
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS=$srcdir/tests
+OFMFONTS=$srcdir/$tests
 export TEXMFCNF OFMFONTS
 
-echo && echo "*** ./omfonts"
-./omfonts && exit 1
+echo && echo "*** $_omfonts"
+$_omfonts && exit 1
 
 echo && echo "*** ofm2opl badofm badofm"
-./omfonts -ofm2opl $srcdir/tests/badofm badofm && exit 1
+$_omfonts -ofm2opl $srcdir/$tests/badofm badofm && rc=1
 
 echo && echo "*** opl2ofm badopl badopl"
-./omfonts -opl2ofm $srcdir/tests/badopl badopl && exit 1
+$_omfonts -opl2ofm $srcdir/$tests/badopl badopl && rc=2
 
 echo && echo "*** ovf2ovp badovf badovf badovf"
-./omfonts -ovf2ovp $srcdir/tests/badovf $srcdir/tests/badovf badovf && exit 1
+$_omfonts -ovf2ovp $srcdir/$tests/badovf $srcdir/$tests/badovf badovf && rc=3
 
 echo && echo "*** ovp2ovf badovp badovp"
-./omfonts -ovp2ovf $srcdir/tests/badovp badovp && exit 1
+$_omfonts -ovp2ovf $srcdir/$tests/badovp badovp && rc=4
 
-exit 0
+exit $rc
 
diff --git a/Build/source/texk/web2c/omegafonts/charwd.test b/Build/source/texk/web2c/omegafonts/charwd.test
index ef0246fa546..2ca58168c4f 100755
--- a/Build/source/texk/web2c/omegafonts/charwd.test
+++ b/Build/source/texk/web2c/omegafonts/charwd.test
@@ -4,34 +4,42 @@
 # Copyright 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
 
-grep -v 'CHARWD R' $srcdir/tests/charwd-r.pl >tests/charwdr.pl
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
+
+grep -v 'CHARWD R' $srcdir/$tests/charwd-r.pl >$tests/charwdr.pl
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -opl2ofm tests/charwdr.pl tests/charwdr.tfm || exit 1
+  $_omfonts -opl2ofm $tests/charwdr.pl $tests/charwdr.tfm || rc=1
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  TFMFONTS=tests \
-  ./omfonts -ofm2opl tests/charwdr.tfm tests/charwdr.xpl || exit 1
+  TFMFONTS=$tests \
+  $_omfonts -ofm2opl $tests/charwdr.tfm $tests/charwdr.xpl || rc=2
 
-diff $srcdir/tests/charwd-r.pl tests/charwdr.xpl || exit 1
+diff $srcdir/$tests/charwd-r.pl $tests/charwdr.xpl || rc=3
 
-grep -v 'CHARWD R' $srcdir/tests/charwd-v.vpl >tests/charwdv.vpl
+grep -v 'CHARWD R' $srcdir/$tests/charwd-v.vpl >$tests/charwdv.vpl
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -ovp2ovf tests/charwdv.vpl tests/charwdv.vf tests/charwdv.tfm || exit 1
+  $_omfonts -ovp2ovf $tests/charwdv.vpl $tests/charwdv.vf $tests/charwdv.tfm || rc=4
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  TFMFONTS=tests \
-  ./omfonts -ofm2opl tests/charwdr.tfm tests/charwdr.xpl || exit 1
+  TFMFONTS=$tests \
+  $_omfonts -ofm2opl $tests/charwdr.tfm $tests/charwdr.xpl || rc=5
 
-diff $srcdir/tests/charwd-r.pl tests/charwdr.xpl || exit 1
+diff $srcdir/$tests/charwd-r.pl $tests/charwdr.xpl || rc=6
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  TFMFONTS=tests \
-  VFFONTS=tests \
-  ./omfonts -ovf2ovp tests/charwdv.vf tests/charwdv.tfm tests/charwdv.xpl || exit 1
+  TFMFONTS=$tests \
+  VFFONTS=$tests \
+  $_omfonts -ovf2ovp $tests/charwdv.vf $tests/charwdv.tfm $tests/charwdv.xpl || rc=7
 
-diff $srcdir/tests/charwd-v.vpl tests/charwdv.xpl || exit 1
+diff $srcdir/$tests/charwd-v.vpl $tests/charwdv.xpl || rc=8
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegafonts/check.test b/Build/source/texk/web2c/omegafonts/check.test
index ba97c62c086..4a0ec1ac256 100755
--- a/Build/source/texk/web2c/omegafonts/check.test
+++ b/Build/source/texk/web2c/omegafonts/check.test
@@ -4,24 +4,32 @@
 # Copyright 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
 
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS=".;./tests"
+OFMFONTS=".;./$tests"
 export TEXMFCNF OFMFONTS
 
 echo && echo "*** ofm2opl check xcheck"
-./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 1
+$_omfonts -ofm2opl $srcdir/$tests/check $tests/xcheck || rc=1
 
 echo && echo "*** diff check.opl xcheck.opl"
-diff $srcdir/tests/check.opl tests/xcheck.opl || exit 1
+diff $srcdir/$tests/check.opl $tests/xcheck.opl || rc=2
 
 echo && echo "*** opl2ofm xcheck xchecked"
-./omfonts -opl2ofm tests/xcheck tests/xchecked || exit 1
+$_omfonts -opl2ofm $tests/xcheck $tests/xchecked || rc=3
 
 echo && echo "*** ofm2opl xchecked stdout (xchecked.opl)"
-./omfonts -ofm2opl tests/xchecked >tests/xchecked.opl || exit 1
+$_omfonts -ofm2opl $tests/xchecked >$tests/xchecked.opl || rc=4
 
 echo && echo "*** diff checked.opl xchecked.opl"
-diff $srcdir/tests/checked.opl tests/xchecked.opl || exit 1
+diff $srcdir/$tests/checked.opl $tests/xchecked.opl || rc=5
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegafonts/help.test b/Build/source/texk/web2c/omegafonts/help.test
index 8ce78ba199e..308cf155e8b 100755
--- a/Build/source/texk/web2c/omegafonts/help.test
+++ b/Build/source/texk/web2c/omegafonts/help.test
@@ -4,18 +4,22 @@
 # Copyright 2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
 echo && echo "*** omfonts -help"
-./omfonts -help || exit 1
+$_omfonts -help || exit 1
 
 echo && echo "*** ofm2opl -help"
-./omfonts -ofm2opl -char-format=foo -num=bar -text=baz -help || exit 1
+$_omfonts -ofm2opl -char-format=foo -num=bar -text=baz -help || exit 2
 
 echo && echo "*** opl2ofm -help"
-./omfonts -opl2ofm -char-format=num -num=hex -text=mixed -help || exit 1
+$_omfonts -opl2ofm -char-format=num -num=hex -text=mixed -help || exit 3
 
 echo && echo "*** ovf2ovp -help"
-./omfonts -ovf2ovp -char-format=foo -num=bar -text=baz -help || exit 1
+$_omfonts -ovf2ovp -char-format=foo -num=bar -text=baz -help || exit 4
 
 echo && echo "*** ovp2ovf -help"
-./omfonts -ovp2ovf -char-format=ascii -num=octal -text=upper -help || exit 1
+$_omfonts -ovp2ovf -char-format=ascii -num=octal -text=upper -help || exit 5
 
diff --git a/Build/source/texk/web2c/omegafonts/level1.test b/Build/source/texk/web2c/omegafonts/level1.test
index af032ce0b73..10c00fa223b 100755
--- a/Build/source/texk/web2c/omegafonts/level1.test
+++ b/Build/source/texk/web2c/omegafonts/level1.test
@@ -4,13 +4,19 @@
 # Copyright 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -opl2ofm -verbose $srcdir/tests/level1 tests/xlevel1 || exit 1
+  $_omfonts -opl2ofm -verbose $srcdir/$tests/level1 $tests/xlevel1 || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -ofm2opl -verbose tests/xlevel1 tests/xlevel1 || exit 1
+  $_omfonts -ofm2opl -verbose $tests/xlevel1 $tests/xlevel1 || exit 2
 
-diff $srcdir/tests/level1.opl tests/xlevel1.opl || exit 1
+diff $srcdir/$tests/level1.opl $tests/xlevel1.opl || exit 3
 
diff --git a/Build/source/texk/web2c/omegafonts/ligkern.test b/Build/source/texk/web2c/omegafonts/ligkern.test
index d3378bea2d6..d03321a9478 100755
--- a/Build/source/texk/web2c/omegafonts/ligkern.test
+++ b/Build/source/texk/web2c/omegafonts/ligkern.test
@@ -4,64 +4,73 @@
 # Copyright 2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
 
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS='.;./tests'
+OFMFONTS=".;./$tests"
 export TEXMFCNF OFMFONTS
 
-for f in ligall ligbch ligblb ligbdy; do
+ligfiles='ligall ligbch ligblb ligbdy'
+
+for f in $ligfiles; do
 
 echo && echo "*** opl2ofm $f x$f"
-./omfonts -opl2ofm $srcdir/tests/$f tests/x$f || exit 1
+$_omfonts -opl2ofm $srcdir/$tests/$f $tests/x$f || rc=1
 
 echo && echo "*** ofm2opl x$f x$f"
-./omfonts -ofm2opl tests/x$f tests/x$f || exit 1
+$_omfonts -ofm2opl $tests/x$f $tests/x$f || rc=2
 
 echo && echo "*** diff $f.opl x$f.opl"
-diff $srcdir/tests/$f.opl tests/x$f.opl || exit 1
+diff $srcdir/$tests/$f.opl $tests/x$f.opl || rc=3
 
 done
 
 echo && echo "*** ovp2ovf ligblv xligblv xligblv"
-./omfonts -ovp2ovf $srcdir/tests/ligblv tests/xligblv tests/xligblv || echo '*** failed ***'
+$_omfonts -ovp2ovf $srcdir/$tests/ligblv $tests/xligblv $tests/xligblv || { rc=4; echo '*** failed ***'; }
 
 echo && echo "*** ofm2opl xligblv xligblv"
-./omfonts -ofm2opl tests/xligblv tests/xligblv || echo '*** failed ***'
+$_omfonts -ofm2opl $tests/xligblv $tests/xligblv || { rc=5; echo '*** failed ***'; }
 
 echo && echo "*** diff ligblv.opl xligblv.opl"
-diff $srcdir/tests/ligblv.opl tests/xligblv.opl >/dev/null || echo '*** failed ***'
+diff $srcdir/$tests/ligblv.opl $tests/xligblv.opl >/dev/null || { rc=6; echo '*** failed ***'; }
 
 echo && echo "*** ofm2opl ligloop1 xligloop1"
-./omfonts -ofm2opl $srcdir/tests/ligloop1 tests/xligloop1 || exit 1
+$_omfonts -ofm2opl $srcdir/$tests/ligloop1 $tests/xligloop1 || rc=7
 
 echo && echo "*** diff ligloop1.opl xligloop1.opl"
-diff $srcdir/tests/ligloop1.opl tests/xligloop1.opl || exit 1
+diff $srcdir/$tests/ligloop1.opl $tests/xligloop1.opl || rc=8
 
 echo && echo "*** opl2ofm xligloop1 xligloop1"
-./omfonts -opl2ofm tests/xligloop1 tests/xligloop1 || exit 1
+$_omfonts -opl2ofm $tests/xligloop1 $tests/xligloop1 || rc=9
 
 echo && echo "*** ofm2opl xligloop1 xligloop2"
-./omfonts -ofm2opl tests/xligloop1 tests/xligloop2 || exit 1
+$_omfonts -ofm2opl $tests/xligloop1 $tests/xligloop2 || rc=10
 
-echo && echo "*** diff ligloop1.opl xligloop1.opl"
-diff $srcdir/tests/ligloop2.opl tests/xligloop2.opl || exit 1
+echo && echo "*** diff ligloop2.opl xligloop2.opl"
+diff $srcdir/$tests/ligloop2.opl $tests/xligloop2.opl || rc=11
 
 echo && echo "*** opl2ofm liguse xliguse1"
-./omfonts -opl2ofm $srcdir/tests/liguse tests/xliguse1 || exit 1
+$_omfonts -opl2ofm $srcdir/$tests/liguse $tests/xliguse1 || rc=12
 
 echo && echo "*** ofm2opl xliguse1 xliguse1"
-./omfonts -ofm2opl tests/xliguse1 tests/xliguse1 || exit 1
+$_omfonts -ofm2opl $tests/xliguse1 $tests/xliguse1 || rc=13
 
 echo && echo "*** diff liguse1.opl xliguse1.opl"
-diff $srcdir/tests/liguse1.opl tests/xliguse1.opl|| exit 1
+diff $srcdir/$tests/liguse1.opl $tests/xliguse1.opl || rc=14
 
 echo && echo "*** opl2ofm xliguse1 xliguse2"
-./omfonts -opl2ofm tests/xliguse1 tests/xliguse2 || exit 1
+$_omfonts -opl2ofm $tests/xliguse1 $tests/xliguse2 || rc=15
 
 echo && echo "*** ofm2opl xliguse2 xliguse2"
-./omfonts -ofm2opl tests/xliguse2 tests/xliguse2 || exit 1
+$_omfonts -ofm2opl $tests/xliguse2 $tests/xliguse2 || rc=16
 
 echo && echo "*** diff liguse2.opl xliguse2.opl"
-diff $srcdir/tests/liguse2.opl tests/xliguse2.opl|| exit 1
+diff $srcdir/$tests/liguse2.opl $tests/xliguse2.opl || rc=17
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegafonts/ofonts.test b/Build/source/texk/web2c/omegafonts/ofonts.test
index 897c3f863d8..187d2338f4e 100755
--- a/Build/source/texk/web2c/omegafonts/ofonts.test
+++ b/Build/source/texk/web2c/omegafonts/ofonts.test
@@ -4,50 +4,57 @@
 # Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
 
 VPL='ofontr1 ofontv4'
 OVP='ofontr2 ofontr3 ofontv5 ofontv6'
 
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS=.:$srcdir/tests
+OFMFONTS=".;$srcdir/$tests"
 export TEXMFCNF OFMFONTS
 
 for f in $VPL; do
-  ./omfonts -opl2ofm $srcdir/tests/$f.pl tests/x$f.tfm || exit 1
-  ./omfonts -ofm2opl tests/x$f.tfm tests/x$f.pl || exit 1
-  diff $srcdir/tests/$f.pl tests/x$f.pl || exit 1
+  $_omfonts -opl2ofm $srcdir/$tests/$f.pl $tests/x$f.tfm || rc=1
+  $_omfonts -ofm2opl $tests/x$f.tfm $tests/x$f.pl || rc=2
+  diff $srcdir/$tests/$f.pl $tests/x$f.pl || rc=3
 done
 
 for f in $OVP; do
-  ./omfonts -opl2ofm $srcdir/tests/$f tests/x$f || exit 1
-  ./omfonts -ofm2opl tests/x$f tests/x$f || exit 1
-  diff $srcdir/tests/$f.opl tests/x$f.opl || exit 1
+  $_omfonts -opl2ofm $srcdir/$tests/$f $tests/x$f || rc=4
+  $_omfonts -ofm2opl $tests/x$f $tests/x$f || rc=5
+  diff $srcdir/$tests/$f.opl $tests/x$f.opl || rc=6
 done
 
-rm -rf tests/xofontr* tests/xofontv*
+rm -rf $tests/xofontr* $tests/xofontv*
 
 for f in ofontr0; do
-  ./omfonts -opl2ofm $srcdir/tests/$f.pl tests/x$f.tfm || exit 1
-  ./omfonts -ofm2opl tests/x$f.tfm tests/x$f.pl || exit 1
-  diff $srcdir/tests/$f.pl tests/x$f.pl || exit 1
+  $_omfonts -opl2ofm $srcdir/$tests/$f.pl $tests/x$f.tfm || rc=7
+  $_omfonts -ofm2opl $tests/x$f.tfm $tests/x$f.pl || rc=8
+  diff $srcdir/$tests/$f.pl $tests/x$f.pl || rc=9
 done
 
 for f in $VPL; do
-  ./omfonts -ovp2ovf $srcdir/tests/$f.vpl tests/x$f.vf tests/x$f.tfm || exit 1
-  ./omfonts -ofm2opl tests/x$f.tfm tests/x$f.pl || exit 1
-  diff $srcdir/tests/$f.pl tests/x$f.pl || exit 1
-  ./omfonts -ovf2ovp tests/x$f.vf tests/x$f.tfm tests/x$f.vpl || exit 1
-  diff $srcdir/tests/$f.vpl tests/x$f.vpl || exit 1
+  $_omfonts -ovp2ovf $srcdir/$tests/$f.vpl $tests/x$f.vf $tests/x$f.tfm || rc=10
+  $_omfonts -ofm2opl $tests/x$f.tfm $tests/x$f.pl || rc=11
+  diff $srcdir/$tests/$f.pl $tests/x$f.pl || rc=12
+  $_omfonts -ovf2ovp $tests/x$f.vf $tests/x$f.tfm $tests/x$f.vpl || rc=13
+  diff $srcdir/$tests/$f.vpl $tests/x$f.vpl || rc=14
 done
 
 for f in $OVP; do
-  ./omfonts -ovp2ovf $srcdir/tests/$f tests/x$f tests/x$f || exit 1
-  ./omfonts -ofm2opl tests/x$f tests/x$f || exit 1
-  diff $srcdir/tests/$f.opl tests/x$f.opl || exit 1
-  ./omfonts -ovf2ovp tests/x$f tests/x$f tests/x$f || exit 1
-  diff $srcdir/tests/$f.ovp tests/x$f.ovp || exit 1
+  $_omfonts -ovp2ovf $srcdir/$tests/$f $tests/x$f $tests/x$f || rc=15
+  $_omfonts -ofm2opl $tests/x$f $tests/x$f || rc=16
+  diff $srcdir/$tests/$f.opl $tests/x$f.opl || rc=17
+  $_omfonts -ovf2ovp $tests/x$f $tests/x$f $tests/x$f || rc=18
+  diff $srcdir/$tests/$f.ovp $tests/x$f.ovp || rc=19
 done
 
-exit 0
+exit $rc
 
diff --git a/Build/source/texk/web2c/omegafonts/omfonts.test b/Build/source/texk/web2c/omegafonts/omfonts.test
index 249b426e066..ed08ea2bb13 100755
--- a/Build/source/texk/web2c/omegafonts/omfonts.test
+++ b/Build/source/texk/web2c/omegafonts/omfonts.test
@@ -4,33 +4,44 @@
 # Copyright 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+W2CDir=${W2CDir:-..}
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pltotf=$W2CDir/pltotf$ExeExt
+_tftopl=$W2CDir/tftopl$ExeExt
+_omfonts=$BinDir/omfonts$ExeExt
 
-../pltotf $srcdir/tests/Cherokee tests/Cherokee || exit 1
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
+
+$_pltotf $srcdir/$tests/Cherokee $tests/Cherokee || rc=1
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ../tftopl tests/Cherokee tests/xCherokee || exit 1
+  $_tftopl $tests/Cherokee $tests/xCherokee || rc=2
 
-diff $srcdir/tests/Cherokee.pl tests/xCherokee.pl || exit 1
+diff $srcdir/$tests/Cherokee.pl $tests/xCherokee.pl || rc=3
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  OFMFONTS=tests \
-  ./omfonts -ovp2ovf -verbose $srcdir/tests/OCherokee tests/OCherokee tests/OCherokee || exit 1
+  OFMFONTS=$tests \
+  $_omfonts -ovp2ovf -verbose $srcdir/$tests/OCherokee $tests/OCherokee $tests/OCherokee || rc=4
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -ofm2opl -verbose tests/OCherokee tests/OCherokee || exit 1
+  $_omfonts -ofm2opl -verbose $tests/OCherokee $tests/OCherokee || rc=5
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -opl2ofm -verbose tests/OCherokee tests/xOCherokee || exit 1
+  $_omfonts -opl2ofm -verbose $tests/OCherokee $tests/xOCherokee || rc=6
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -ofm2opl -verbose tests/xOCherokee tests/xOCherokee || exit 1
+  $_omfonts -ofm2opl -verbose $tests/xOCherokee $tests/xOCherokee || rc=7
 
-diff tests/OCherokee.opl tests/xOCherokee.opl || exit 1
+diff $tests/OCherokee.opl $tests/xOCherokee.opl || rc=8
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  OFMFONTS=.:./tests \
-  ./omfonts -ovf2ovp -verbose tests/OCherokee tests/OCherokee tests/xOCherokee || exit 1
+  OFMFONTS=".;./$tests" \
+  $_omfonts -ovf2ovp -verbose $tests/OCherokee $tests/OCherokee $tests/xOCherokee || rc=9
 
-diff $srcdir/tests/OCherokee.ovp tests/xOCherokee.ovp || exit 1
+diff $srcdir/$tests/OCherokee.ovp $tests/xOCherokee.ovp || rc=10
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegafonts/overbmp.test b/Build/source/texk/web2c/omegafonts/overbmp.test
index 87e746c1e07..809e000be2f 100755
--- a/Build/source/texk/web2c/omegafonts/overbmp.test
+++ b/Build/source/texk/web2c/omegafonts/overbmp.test
@@ -4,50 +4,58 @@
 # Copyright 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
-test -d tests || mkdir -p tests
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
 
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS=./tests
+OFMFONTS=./$tests
 export TEXMFCNF OFMFONTS
 
-./omfonts -opl2ofm $srcdir/tests/inbmp tests/xinbmp || exit 1
+$_omfonts -opl2ofm $srcdir/$tests/inbmp $tests/xinbmp || rc=1
 
-./omfonts -ofm2opl xinbmp tests/xinbmp || exit 1
+$_omfonts -ofm2opl xinbmp $tests/xinbmp || rc=2
 
-diff $srcdir/tests/inbmp.opl tests/xinbmp.opl || exit 1
+diff $srcdir/$tests/inbmp.opl $tests/xinbmp.opl || rc=3
 
-./omfonts -ovp2ovf $srcdir/tests/overbmp.ovp tests/xoverbmp || exit 1
+$_omfonts -ovp2ovf $srcdir/$tests/overbmp.ovp $tests/xoverbmp || rc=4
 
-./omfonts -ofm2opl xoverbmp tests/xoverbmp || exit 1
+$_omfonts -ofm2opl xoverbmp $tests/xoverbmp || rc=5
 
-diff $srcdir/tests/overbmp.opl tests/xoverbmp.opl || exit 1
+diff $srcdir/$tests/overbmp.opl $tests/xoverbmp.opl || rc=6
 
-./omfonts -ovf2ovp tests/xoverbmp xoverbmp tests/xoverbmp.ovp || exit 1
+$_omfonts -ovf2ovp $tests/xoverbmp xoverbmp $tests/xoverbmp.ovp || rc=7
 
-diff $srcdir/tests/overbmp.ovp tests/xoverbmp.ovp || exit 1
+diff $srcdir/$tests/overbmp.ovp $tests/xoverbmp.ovp || rc=8
 
-sed -e '/OFMLEVEL/s/H 0/H 1/' tests/xinbmp.opl >tests/xinbmp1.opl
+sed -e '/OFMLEVEL/s/H 0/H 1/' $tests/xinbmp.opl >$tests/xinbmp1.opl
 
-./omfonts -opl2ofm tests/xinbmp1 tests/xinbmp1 || exit 1
+$_omfonts -opl2ofm $tests/xinbmp1 $tests/xinbmp1 || rc=9
 
-./omfonts -ofm2opl xinbmp1 tests/xinbmp2 || exit 1
+$_omfonts -ofm2opl xinbmp1 $tests/xinbmp2 || rc=10
 
-diff tests/xinbmp1.opl tests/xinbmp1.opl || exit 1
+diff $tests/xinbmp1.opl $tests/xinbmp1.opl || rc=11
 
 sed -e '/OFMLEVEL/s/H 1/H 0/' -e 's/xinbmp)/xinbmp1)/;s/xoverbmp)/xoverbmp1)/' \
-	tests/xoverbmp.ovp >tests/xoverbmp1.ovp
+	$tests/xoverbmp.ovp >$tests/xoverbmp1.ovp
 
-./omfonts -ovp2ovf tests/xoverbmp1.ovp tests/xoverbmp1 || exit 1
+$_omfonts -ovp2ovf $tests/xoverbmp1.ovp $tests/xoverbmp1 || rc=12
 
-sed -e '/OFMLEVEL/s/H 1/H 0/' tests/xoverbmp.opl >tests/xoverbmp1.opl
+sed -e '/OFMLEVEL/s/H 1/H 0/' $tests/xoverbmp.opl >$tests/xoverbmp1.opl
 
-./omfonts -ofm2opl xoverbmp1 tests/xoverbmp2 || exit 1
+$_omfonts -ofm2opl xoverbmp1 $tests/xoverbmp2 || rc=13
 
-diff tests/xoverbmp1.opl tests/xoverbmp2.opl || exit 1
+diff $tests/xoverbmp1.opl $tests/xoverbmp2.opl || rc=14
 
-./omfonts -ovf2ovp tests/xoverbmp1 xoverbmp1 tests/xoverbmp2 || exit 1
+$_omfonts -ovf2ovp $tests/xoverbmp1 xoverbmp1 $tests/xoverbmp2 || rc=15
 
-diff tests/xoverbmp1.ovp tests/xoverbmp2.ovp || exit 1
+diff $tests/xoverbmp1.ovp $tests/xoverbmp2.ovp || rc=16
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegafonts/realnum.test b/Build/source/texk/web2c/omegafonts/realnum.test
index e1d57d93e7f..2e43ee99d87 100755
--- a/Build/source/texk/web2c/omegafonts/realnum.test
+++ b/Build/source/texk/web2c/omegafonts/realnum.test
@@ -4,15 +4,21 @@
 # Copyright 2012 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
 
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS=tests
+OFMFONTS=./$tests
 export TEXMFCNF OFMFONTS
 
-./omfonts -opl2ofm -verbose $srcdir/tests/realnum tests/xrealnum || exit 1
+$_omfonts -opl2ofm -verbose $srcdir/$tests/realnum $tests/xrealnum || exit 1
 
-./omfonts -ofm2opl -verbose xrealnum tests/xrealnum || exit 1
+$_omfonts -ofm2opl -verbose xrealnum $tests/xrealnum || exit 2
 
-diff $srcdir/tests/realnum.out tests/xrealnum.opl || exit 1
+diff $srcdir/$tests/realnum.out $tests/xrealnum.opl || exit 3
 
diff --git a/Build/source/texk/web2c/omegafonts/repeat.test b/Build/source/texk/web2c/omegafonts/repeat.test
index 31606411101..5331922b9ea 100755
--- a/Build/source/texk/web2c/omegafonts/repeat.test
+++ b/Build/source/texk/web2c/omegafonts/repeat.test
@@ -4,13 +4,19 @@
 # Copyright 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+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 1
+  ./omfonts -ofm2opl -verbose $tests/xrepeated $tests/xrepeated || exit 2
 
-diff $srcdir/tests/repeated.opl tests/xrepeated.opl || exit 1
+diff $srcdir/$tests/repeated.opl $tests/xrepeated.opl || exit 3
 
diff --git a/Build/source/texk/web2c/omegafonts/selectfont.test b/Build/source/texk/web2c/omegafonts/selectfont.test
index 8c8f4864dc8..9e605587028 100755
--- a/Build/source/texk/web2c/omegafonts/selectfont.test
+++ b/Build/source/texk/web2c/omegafonts/selectfont.test
@@ -4,29 +4,37 @@
 # Copyright 2011-2015 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
 
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS=tests
+OFMFONTS=./$tests
 export TEXMFCNF OFMFONTS
 
-./omfonts -opl2ofm -verbose $srcdir/tests/sample0-h tests/sample0-h || exit 1
+$_omfonts -opl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample0-h || rc=1
 
-./omfonts -opl2ofm -verbose $srcdir/tests/sample0-h tests/sample1-h || exit 1
+$_omfonts -opl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample1-h || rc=2
 
-./omfonts -ofm2opl -verbose sample1-h tests/sample1-h || exit 1
+$_omfonts -ofm2opl -verbose sample1-h $tests/sample1-h || rc=3
 
-diff $srcdir/tests/sample0-h.opl tests/sample1-h.opl || exit 1
+diff $srcdir/$tests/sample0-h.opl $tests/sample1-h.opl || rc=4
 
-./omfonts -ovp2ovf -verbose $srcdir/tests/sample tests/sample tests/sample || exit 1
+$_omfonts -ovp2ovf -verbose $srcdir/$tests/sample $tests/sample $tests/sample || rc=5
 
-./omfonts -ovf2ovp -verbose tests/sample sample tests/xsample.out || exit 1
+$_omfonts -ovf2ovp -verbose $tests/sample sample $tests/xsample.out || rc=6
 
-diff $srcdir/tests/sample.out tests/xsample.out || exit 1
+diff $srcdir/$tests/sample.out $tests/xsample.out || rc=7
 
-./omfonts -ovp2ovf -verbose $srcdir/tests/sample.ovp tests/sample2.ovf || exit 1
+$_omfonts -ovp2ovf -verbose $srcdir/$tests/sample.ovp $tests/sample2.ovf || rc=8
 
-./omfonts -ovf2ovp -verbose tests/sample2 sample2 >tests/xsample2.out || exit 1
+$_omfonts -ovf2ovp -verbose $tests/sample2 sample2 >$tests/xsample2.out || rc=9
 
-diff $srcdir/tests/sample.out tests/xsample2.out || exit 1
+diff $srcdir/$tests/sample.out $tests/xsample2.out || rc=10
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegafonts/shorten.test b/Build/source/texk/web2c/omegafonts/shorten.test
index c703395fae1..1f53f65a9ac 100755
--- a/Build/source/texk/web2c/omegafonts/shorten.test
+++ b/Build/source/texk/web2c/omegafonts/shorten.test
@@ -4,6 +4,12 @@
 # Copyright 2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
+W2CDir=${W2CDir:-..}
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pltotf=$W2CDir/pltotf$ExeExt
+_omfonts=$BinDir/omfonts$ExeExt
+
 tests=tests
 
 test -d $tests || mkdir -p $tests
@@ -12,16 +18,16 @@ TEXMFCNF=$srcdir/../../kpathsea
 export TEXMFCNF
 
 echo && echo "pltotf $tests/shorten.opl $tests/shortend.tfm" && \
-  ../pltotf $srcdir/$tests/shorten.opl $tests/shortend.tfm || exit
+  $_pltotf $srcdir/$tests/shorten.opl $tests/shortend.tfm || exit
 
 echo && echo "omfonts -ofm2opl $tests/shorten.tfm $tests/shortend.pl" && \
-  ./omfonts -ofm2opl $tests/shortend.tfm $tests/shortend.pl || exit
+  $_omfonts -ofm2opl $tests/shortend.tfm $tests/shortend.pl || exit
 
 echo && echo "omfonts -opl2ofm $tests/shorten $tests/shortend" && \
-  ./omfonts -opl2ofm $srcdir/$tests/shorten $tests/shortend || exit
+  $_omfonts -opl2ofm $srcdir/$tests/shorten $tests/shortend || exit
 
 echo && echo "omfonts -ofm2opl $tests/shorten $tests/shortend" && \
-  ./omfonts -ofm2opl $tests/shortend $tests/shortend || exit
+  $_omfonts -ofm2opl $tests/shortend $tests/shortend || exit
 
 diff $tests/shortend.pl $tests/shortend.opl || exit
 
diff --git a/Build/source/texk/web2c/omegafonts/specialhex.test b/Build/source/texk/web2c/omegafonts/specialhex.test
index 1e3046c08c4..82523d1a452 100755
--- a/Build/source/texk/web2c/omegafonts/specialhex.test
+++ b/Build/source/texk/web2c/omegafonts/specialhex.test
@@ -4,26 +4,34 @@
 # Copyright 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  OFMFONTS=tests \
-  ./omfonts -ovp2ovf -verbose $srcdir/tests/specialhex tests/specialhex tests/specialhex || exit 1
+  OFMFONTS=./$tests \
+  $_omfonts -ovp2ovf -verbose $srcdir/$tests/specialhex $tests/specialhex $tests/specialhex || rc=1
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -ofm2opl -verbose tests/specialhex tests/specialhex || exit 1
+  $_omfonts -ofm2opl -verbose $tests/specialhex $tests/specialhex || rc=2
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -opl2ofm -verbose tests/specialhex tests/xspecialhex || exit 1
+  $_omfonts -opl2ofm -verbose $tests/specialhex $tests/xspecialhex || rc=3
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  ./omfonts -ofm2opl -verbose tests/xspecialhex tests/xspecialhex || exit 1
+  $_omfonts -ofm2opl -verbose $tests/xspecialhex $tests/xspecialhex || rc=4
 
-diff tests/specialhex.opl tests/xspecialhex.opl || exit 1
+diff $tests/specialhex.opl $tests/xspecialhex.opl || rc=5
 
 TEXMFCNF=$srcdir/../../kpathsea \
-  OFMFONTS=.:./tests \
-  ./omfonts -ovf2ovp -verbose tests/specialhex tests/specialhex tests/xspecialhex || exit 1
+  OFMFONTS=".;./$tests" \
+  $_omfonts -ovf2ovp -verbose $tests/specialhex $tests/specialhex $tests/xspecialhex || rc=6
 
-diff $srcdir/tests/specialhex.ovp tests/xspecialhex.ovp || exit 1
+diff $srcdir/$tests/specialhex.ovp $tests/xspecialhex.ovp || rc=7
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegafonts/version.test b/Build/source/texk/web2c/omegafonts/version.test
index 9375b584999..08fc6b845b2 100755
--- a/Build/source/texk/web2c/omegafonts/version.test
+++ b/Build/source/texk/web2c/omegafonts/version.test
@@ -4,18 +4,21 @@
 # Copyright 2015 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_omfonts=$BinDir/omfonts$ExeExt
+
 echo && echo "*** omfonts -version"
-./omfonts -version || exit 1
+$_omfonts -version || exit 10
 
 echo && echo "*** ofm2opl -version"
-./omfonts -ofm2opl -version || exit 1
+$_omfonts -ofm2opl -version || exit 1
 
 echo && echo "*** opl2ofm -version"
-./omfonts -opl2ofm -version || exit 1
+$_omfonts -opl2ofm -version || exit 2
 
 echo && echo "*** ovf2ovp -version"
-./omfonts -ovf2ovp -version || exit 1
+$_omfonts -ovf2ovp -version || exit 3
 
 echo && echo "*** ovp2ovf -version"
-./omfonts -ovp2ovf -version || exit 1
-
+$_omfonts -ovp2ovf -version || exit 4
diff --git a/Build/source/texk/web2c/omegafonts/yannis.test b/Build/source/texk/web2c/omegafonts/yannis.test
index e917e96e185..02655250491 100755
--- a/Build/source/texk/web2c/omegafonts/yannis.test
+++ b/Build/source/texk/web2c/omegafonts/yannis.test
@@ -4,57 +4,70 @@
 # Copyright 2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-test -d tests || mkdir -p tests
+W2CDir=${W2CDir:-..}
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pltotf=$W2CDir/pltotf$ExeExt
+_omfonts=$BinDir/omfonts$ExeExt
+
+tests=tests
+
+test -d $tests || mkdir -p $tests
+rc=0
 
 TEXMFCNF=$srcdir/../../kpathsea
-OFMFONTS='.;./tests'
+OFMFONTS=".;./$tests"
 export TEXMFCNF OFMFONTS
 
 echo && echo "*** pltotf arabicr yarabicr"
-../pltotf $srcdir/tests/arabicr tests/yarabicr || exit 1
+$_pltotf $srcdir/$tests/arabicr $tests/yarabicr || rc=1
 
 echo && echo "*** opl2ofm arabicr.pl zyarabicr"
-./omfonts -opl2ofm -verbose $srcdir/tests/arabicr.pl tests/zyarabicr || exit 1
+$_omfonts -opl2ofm -verbose $srcdir/$tests/arabicr.pl $tests/zyarabicr || rc=2
+
+echo && echo "*** cmp yarabicr.tfm zyarabicr.ofm"
+cmp $tests/yarabicr.tfm $tests/zyarabicr.ofm || rc=3
 
 echo && echo "*** ofm2opl yarabicr.tfm xyarabicr"
-./omfonts -ofm2opl -verbose tests/yarabicr.tfm tests/xyarabicr || exit 1
+$_omfonts -ofm2opl -verbose $tests/yarabicr.tfm $tests/xyarabicr || rc=4
 
 echo && echo "*** ofm2opl zyarabicr zyarabicr"
-./omfonts -ofm2opl -verbose tests/zyarabicr tests/zyarabicr || exit 1
+$_omfonts -ofm2opl -verbose $tests/zyarabicr $tests/zyarabicr || rc=5
 
 echo && echo "*** diff xyarabicr.opl zyarabicr.opl"
-diff tests/xyarabicr.opl tests/zyarabicr.opl || exit 1
+diff $tests/xyarabicr.opl $tests/zyarabicr.opl || rc=6
 
 echo && echo "*** ovp2ovf arabic yarabic yarabic"
-./omfonts -ovp2ovf -verbose $srcdir/tests/arabic tests/yarabic tests/yarabic || exit 1
+$_omfonts -ovp2ovf -verbose $srcdir/$tests/arabic $tests/yarabic $tests/yarabic || rc=7
 
 echo && echo "*** ofm2opl yarabic xyarabic"
-./omfonts -ofm2opl -verbose tests/yarabic tests/xyarabic || exit 1
+$_omfonts -ofm2opl -verbose $tests/yarabic $tests/xyarabic || rc=8
 
 echo && echo "*** opl2ofm xyarabic xyarabic"
-./omfonts -opl2ofm -verbose tests/xyarabic tests/xyarabic || exit 1
+$_omfonts -opl2ofm -verbose $tests/xyarabic $tests/xyarabic || rc=9
 
 echo && echo "*** ofm2opl xyarabic yyarabic"
-./omfonts -ofm2opl -verbose tests/xyarabic tests/yyarabic || exit 1
+$_omfonts -ofm2opl -verbose $tests/xyarabic $tests/yyarabic || rc=10
 
 echo && echo "*** diff xyarabicr.opl yyarabicr.opl"
-diff tests/xyarabic.opl tests/yyarabic.opl || exit 1
+diff $tests/xyarabic.opl $tests/yyarabic.opl || rc=11
 
 echo && echo "*** ovf2ovp yarabic yarabic yyarabic"
-./omfonts -ovf2ovp -verbose tests/yarabic tests/yarabic tests/yyarabic || exit 1
+$_omfonts -ovf2ovp -verbose $tests/yarabic $tests/yarabic $tests/yyarabic || rc=12
 
 echo && echo "*** ovp2ovf yyarabic yyarabic yyarabic"
-./omfonts -ovp2ovf -verbose tests/yyarabic tests/yyarabic tests/yyarabic || exit 1
+$_omfonts -ovp2ovf -verbose $tests/yyarabic $tests/yyarabic $tests/yyarabic || rc=13
 
 echo && echo "*** ofm2opl yyarabic xyarabic"
-./omfonts -ofm2opl -verbose tests/yyarabic tests/zyarabic || exit 1
+$_omfonts -ofm2opl -verbose $tests/yyarabic $tests/zyarabic || rc=14
 
 echo && echo "*** diff xyarabicr.opl zyarabicr.opl"
-diff tests/xyarabic.opl tests/zyarabic.opl || exit 1
+diff $tests/xyarabic.opl $tests/zyarabic.opl || rc=15
 
 echo && echo "*** ovf2ovp yyarabic yyarabic zyarabic"
-./omfonts -ovf2ovp -verbose tests/yyarabic tests/yyarabic tests/zyarabic || exit 1
+$_omfonts -ovf2ovp -verbose $tests/yyarabic $tests/yyarabic $tests/zyarabic || rc=16
 
 echo && echo "*** diff yyarabicr.ovp yyarabicr.ovp"
-diff tests/yyarabic.ovp tests/zyarabic.ovp || exit 1
+diff $tests/yyarabic.ovp $tests/zyarabic.ovp || rc=17
 
+exit $rc
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index efe4b25b673..053b99a5b5d 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-19  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* {odvicopy,odvitype,ofonts,overbmp}.test:
+	Update.
+
 2023-08-13  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* {bad,charwd,check,help,level1,ligkern,odvicopy,odvitype,
diff --git a/Build/source/texk/web2c/omegaware/odvicopy.test b/Build/source/texk/web2c/omegaware/odvicopy.test
index ab505689dcb..3a08f0ce14a 100755
--- a/Build/source/texk/web2c/omegaware/odvicopy.test
+++ b/Build/source/texk/web2c/omegaware/odvicopy.test
@@ -9,14 +9,6 @@ ExeExt=${ExeExt:-}
 _odvicopy=$BinDir/odvicopy$ExeExt
 _odvitype=$BinDir/odvitype$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
-
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 tests=omegaware/tests
@@ -56,7 +48,7 @@ TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=$srcdir/$tests \
   $_odvitype $tests/xofontd1 | sed '1s/ (.*)$//' >$tests/xofontd1.typ || rc=6
 
-$DIFF $srcdir/$tests/ofontd1.typ $tests/xofontd1.typ || rc=7
+diff $srcdir/$tests/ofontd1.typ $tests/xofontd1.typ || rc=7
 
 # Next with VF/OVF files for ofontv[4-6]
 #
@@ -73,7 +65,7 @@ TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=$srcdir/$tests \
   $_odvitype $tests/xofontd2 | sed '1s/ (.*)$//' >$tests/xofontd2.typ || rc=9
 
-$DIFF $srcdir/$tests/ofontd2.typ $tests/xofontd2.typ || rc=10
+diff $srcdir/$tests/ofontd2.typ $tests/xofontd2.typ || rc=10
 
 # Finally with VF/OVF files for ofontr[1-3] and ofontv[4-6]
 #
@@ -90,7 +82,7 @@ TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=$srcdir/$tests \
   $_odvitype $tests/xofontd3 | sed '1s/ (.*)$//' >$tests/xofontd3.typ || rc=12
 
-$DIFF $srcdir/$tests/ofontd3.typ $tests/xofontd3.typ || rc=13
+diff $srcdir/$tests/ofontd3.typ $tests/xofontd3.typ || rc=13
 
 exit $rc
 
diff --git a/Build/source/texk/web2c/omegaware/odvitype.test b/Build/source/texk/web2c/omegaware/odvitype.test
index 5add153a89c..49fb0d05319 100755
--- a/Build/source/texk/web2c/omegaware/odvitype.test
+++ b/Build/source/texk/web2c/omegaware/odvitype.test
@@ -8,14 +8,6 @@ BinDir=${BinDir:-.}
 ExeExt=${ExeExt:-}
 _odvitype=$BinDir/odvitype$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
-
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 tests=omegaware/tests
@@ -26,5 +18,5 @@ TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=$srcdir/$tests \
   $_odvitype $srcdir/$tests/ofontd0 | sed '1s/ (.*)$//' >$tests/xofontd0.typ || exit 1
 
-$DIFF $srcdir/$tests/ofontd0.typ $tests/xofontd0.typ || exit 2
+diff $srcdir/$tests/ofontd0.typ $tests/xofontd0.typ || exit 2
 
diff --git a/Build/source/texk/web2c/omegaware/ofonts.test b/Build/source/texk/web2c/omegaware/ofonts.test
index 5a917fb8635..64188b44ef9 100755
--- a/Build/source/texk/web2c/omegaware/ofonts.test
+++ b/Build/source/texk/web2c/omegaware/ofonts.test
@@ -11,14 +11,6 @@ _wopl2ofm=$BinDir/wopl2ofm$ExeExt
 _wovf2ovp=$BinDir/wovf2ovp$ExeExt
 _wovp2ovf=$BinDir/wovp2ovf$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=omegaware/tests
 
 test -d $tests || mkdir -p $tests
diff --git a/Build/source/texk/web2c/omegaware/overbmp.test b/Build/source/texk/web2c/omegaware/overbmp.test
index c16180f1157..7b8bd1bb7ec 100755
--- a/Build/source/texk/web2c/omegaware/overbmp.test
+++ b/Build/source/texk/web2c/omegaware/overbmp.test
@@ -11,14 +11,6 @@ _wopl2ofm=$BinDir/wopl2ofm$ExeExt
 _wovf2ovp=$BinDir/wovf2ovp$ExeExt
 _wovp2ovf=$BinDir/wovp2ovf$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
-
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 tests=omegaware/tests
@@ -52,7 +44,7 @@ $_wopl2ofm -verbose $tests/xinbmp1 $tests/xinbmp1 || rc=9
 
 $_wofm2opl -verbose xinbmp1 $tests/xinbmp2 || rc=10
 
-$DIFF $tests/xinbmp1.opl $tests/xinbmp1.opl || rc=11
+diff $tests/xinbmp1.opl $tests/xinbmp1.opl || rc=11
 
 sed -e '/OFMLEVEL/s/H 1/H 0/' -e 's/xinbmp)/xinbmp1)/;s/xoverbmp)/xoverbmp1)/' \
 	$tests/xoverbmp.ovp >$tests/xoverbmp1.ovp
@@ -63,7 +55,7 @@ sed -e '/OFMLEVEL/s/H 1/H 0/' $tests/xoverbmp.opl >$tests/xoverbmp1.opl
 
 $_wofm2opl -verbose xoverbmp1 $tests/xoverbmp2 || rc=13
 
-$DIFF $tests/xoverbmp1.opl $tests/xoverbmp2.opl || rc=14
+diff $tests/xoverbmp1.opl $tests/xoverbmp2.opl || rc=14
 
 $_wovf2ovp -verbose $tests/xoverbmp1 xoverbmp1 $tests/xoverbmp2 || rc=15