texlive[67907] Build/source/texk/web2c/omegaware: omegaware: update
commits+takuji at tug.org
commits+takuji at tug.org
Sun Aug 13 15:50:51 CEST 2023
Revision: 67907
http://tug.org/svn/texlive?view=revision&revision=67907
Author: takuji
Date: 2023-08-13 15:50:50 +0200 (Sun, 13 Aug 2023)
Log Message:
-----------
omegaware: update tests
Modified Paths:
--------------
trunk/Build/source/texk/web2c/omegaware/ChangeLog
trunk/Build/source/texk/web2c/omegaware/bad.test
trunk/Build/source/texk/web2c/omegaware/charwd.test
trunk/Build/source/texk/web2c/omegaware/check.test
trunk/Build/source/texk/web2c/omegaware/help.test
trunk/Build/source/texk/web2c/omegaware/level1.test
trunk/Build/source/texk/web2c/omegaware/ligkern.test
trunk/Build/source/texk/web2c/omegaware/odvicopy.test
trunk/Build/source/texk/web2c/omegaware/odvitype.test
trunk/Build/source/texk/web2c/omegaware/ofonts.test
trunk/Build/source/texk/web2c/omegaware/omfonts.test
trunk/Build/source/texk/web2c/omegaware/otangle.test
trunk/Build/source/texk/web2c/omegaware/overbmp.test
trunk/Build/source/texk/web2c/omegaware/realnum.test
trunk/Build/source/texk/web2c/omegaware/repeat.test
trunk/Build/source/texk/web2c/omegaware/selectfont.test
trunk/Build/source/texk/web2c/omegaware/shorten.test
trunk/Build/source/texk/web2c/omegaware/specialhex.test
trunk/Build/source/texk/web2c/omegaware/version.test
trunk/Build/source/texk/web2c/omegaware/vrepeat.test
trunk/Build/source/texk/web2c/omegaware/yannis.test
Modified: trunk/Build/source/texk/web2c/omegaware/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/ChangeLog 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/ChangeLog 2023-08-13 13:50:50 UTC (rev 67907)
@@ -1,3 +1,10 @@
+2023-08-13 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * {bad,charwd,check,help,level1,ligkern,odvicopy,odvitype,
+ ofonts,omfonts,otangle,overbmp,realnum,repeat,selectfont,
+ shorten,specialhex,version,vrepeat,yannis}.test:
+ Make easier to test on Windows.
+
2023-03-09 Karl Berry <karl at tug.org>
* TL'23 release.
Modified: trunk/Build/source/texk/web2c/omegaware/bad.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/bad.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/bad.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,9 +4,17 @@
# Copyright 2015 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
+rc=0
TEXMFCNF=$srcdir/../kpathsea
OFMFONTS=$srcdir/$tests
@@ -13,16 +21,15 @@
export TEXMFCNF OFMFONTS
echo && echo "*** ofm2opl badofm badofm"
-./wofm2opl $srcdir/$tests/badofm omegaware/badofm && exit 1
+$_wofm2opl $srcdir/$tests/badofm omegaware/badofm && rc=1
echo && echo "*** opl2ofm badopl badopl"
-./wopl2ofm $srcdir/$tests/badopl omegaware/badopl && exit 1
+$_wopl2ofm $srcdir/$tests/badopl omegaware/badopl && rc=2
echo && echo "*** ovf2ovp badovf badovf badovf"
-./wovf2ovp $srcdir/$tests/badovf $srcdir/$tests/badovf omegaware/badovf && exit 1
+$_wovf2ovp $srcdir/$tests/badovf $srcdir/$tests/badovf omegaware/badovf && rc=3
echo && echo "*** ovp2ovf badovp badovp"
-./wovp2ovf $srcdir/$tests/badovp omegaware/badovp && exit 1
+$_wovp2ovf $srcdir/$tests/badovp omegaware/badovp && rc=4
-exit 0
-
+exit $rc
Modified: trunk/Build/source/texk/web2c/omegaware/charwd.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/charwd.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/charwd.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,36 +4,45 @@
# Copyright 2010-2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
+rc=0
grep -v 'CHARWD R' $srcdir/$tests/charwd-r.pl >$tests/charwdr.pl
TEXMFCNF=$srcdir/../kpathsea \
- ./wopl2ofm -verbose $tests/charwdr.pl $tests/charwdr.tfm || exit 1
+ $_wopl2ofm -verbose $tests/charwdr.pl $tests/charwdr.tfm || rc=1
TEXMFCNF=$srcdir/../kpathsea \
- OFMFONTS=.:$tests \
- ./wofm2opl -verbose $tests/charwdr.tfm $tests/charwdr.xpl || exit 1
+ OFMFONTS=".;$tests" \
+ $_wofm2opl -verbose $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
TEXMFCNF=$srcdir/../kpathsea \
- ./wovp2ovf -verbose $tests/charwdv.vpl $tests/charwdv.vf $tests/charwdv.tfm || exit 1
+ $_wovp2ovf -verbose $tests/charwdv.vpl $tests/charwdv.vf $tests/charwdv.tfm || rc=4
TEXMFCNF=$srcdir/../kpathsea \
- OFMFONTS=.:$tests \
- ./wofm2opl -verbose $tests/charwdr.tfm $tests/charwdr.xpl || exit 1
+ OFMFONTS=".;$tests" \
+ $_wofm2opl -verbose $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 \
- OFMFONTS=.:$tests \
+ OFMFONTS=".;$tests" \
VFFONTS=$tests \
- ./wovf2ovp -verbose $tests/charwdv.vf $tests/charwdv.tfm $tests/charwdv.xpl || exit 1
+ $_wovf2ovp -verbose $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
Modified: trunk/Build/source/texk/web2c/omegaware/check.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/check.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/check.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,9 +4,23 @@
# Copyright 2014, 2015 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$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
+rc=0
TEXMFCNF=$srcdir/../kpathsea
OFMFONTS=".;./$tests"
@@ -13,17 +27,18 @@
export TEXMFCNF OFMFONTS
echo && echo "*** ofm2opl check xcheck"
-./wofm2opl $srcdir/$tests/check $tests/xcheck || exit 1
+$_wofm2opl $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"
-./wopl2ofm $tests/xcheck $tests/xchecked || exit 1
+$_wopl2ofm $tests/xcheck $tests/xchecked || rc=3
echo && echo "*** ofm2opl xchecked stdout (xchecked.opl)"
-./wofm2opl $tests/xchecked >$tests/xchecked.opl || exit 1
+$_wofm2opl $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
Modified: trunk/Build/source/texk/web2c/omegaware/help.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/help.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/help.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,15 +4,22 @@
# Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
echo && echo "*** ofm2opl -help"
-./wofm2opl -char=foo -help || exit 1
+$_wofm2opl -char=foo -help || exit 1
echo && echo "*** opl2ofm -help"
-./wopl2ofm -help || exit 1
+$_wopl2ofm -help || exit 2
echo && echo "*** ovf2ovp -help"
-./wovf2ovp -char=bar -help || exit 1
+$_wovf2ovp -char=bar -help || exit 3
echo && echo "*** ovp2ovf -help"
-./wovp2ovf -help || exit 1
+$_wovp2ovf -help || exit 4
Modified: trunk/Build/source/texk/web2c/omegaware/level1.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/level1.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/level1.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,14 +4,19 @@
# Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
-./wopl2ofm -verbose $srcdir/$tests/level1 $tests/xlevel1 || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/level1 $tests/xlevel1 || exit 1
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/xlevel1 $tests/xlevel1 || exit 1
+ $_wofm2opl -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
Modified: trunk/Build/source/texk/web2c/omegaware/ligkern.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/ligkern.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/ligkern.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,6 +4,13 @@
# Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
tests=omegaware/tests
@@ -10,7 +17,7 @@
test -d $tests || mkdir -p $tests
-TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
+TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
OFMFONTS=".;./$tests"; export OFMFONTS
ligfiles='ligall ligbch ligblb ligbdy'
@@ -18,58 +25,59 @@
for f in $ligfiles; do
echo && echo "*** opl2ofm $f x$f"
-./wopl2ofm $srcdir/$tests/$f $tests/x$f || exit 1
+$_wopl2ofm $srcdir/$tests/$f $tests/x$f || rc=1
echo && echo "*** ofm2opl x$f x$f"
-./wofm2opl $tests/x$f $tests/x$f || exit 1
+$_wofm2opl $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"
-./wovp2ovf $srcdir/$tests/ligblv $tests/xligblv $tests/xligblv || exit 1
+$_wovp2ovf $srcdir/$tests/ligblv $tests/xligblv $tests/xligblv || rc=4
echo && echo "*** ofm2opl xligblv xligblv"
-./wofm2opl $tests/xligblv $tests/xligblv || exit 1
+$_wofm2opl $tests/xligblv $tests/xligblv || rc=5
echo && echo "*** diff ligblv.opl xligblv.opl"
-diff $srcdir/$tests/ligblv.opl $tests/xligblv.opl || exit 1
+diff $srcdir/$tests/ligblv.opl $tests/xligblv.opl || rc=6
echo && echo "*** ofm2opl ligloop1 xligloopx"
-./wofm2opl $srcdir/$tests/ligloop1 $tests/xligloopx || exit 1
+$_wofm2opl $srcdir/$tests/ligloop1 $tests/xligloopx || rc=7
echo && echo "*** diff ligloop1.opl xligloopx.opl"
-diff $srcdir/$tests/ligloop1.opl $tests/xligloopx.opl || exit 1
+diff $srcdir/$tests/ligloop1.opl $tests/xligloopx.opl || rc=8
echo && echo "*** sed xligloopx.opl >xligloop1.opl"
sed -e '/INFINITE/d;/CHANGED/d' $tests/xligloopx.opl >$tests/xligloop1.opl
echo && echo "*** opl2ofm xligloop1 xligloop1"
-./wopl2ofm $tests/xligloop1 $tests/xligloop1 || exit 1
+$_wopl2ofm $tests/xligloop1 $tests/xligloop1 || rc=9
echo && echo "*** ofm2opl xligloop1 xligloop2"
-./wofm2opl $tests/xligloop1 $tests/xligloop2 || exit 1
+$_wofm2opl $tests/xligloop1 $tests/xligloop2 || rc=10
echo && echo "*** diff ligloop2.opl xligloop2.opl"
-diff $srcdir/$tests/ligloop2.opl $tests/xligloop2.opl || exit 1
+diff $srcdir/$tests/ligloop2.opl $tests/xligloop2.opl || rc=11
echo && echo "*** opl2ofm liguse xliguse1"
-./wopl2ofm $srcdir/$tests/liguse $tests/xliguse1 || exit 1
+$_wopl2ofm $srcdir/$tests/liguse $tests/xliguse1 || rc=12
echo && echo "*** ofm2opl xliguse1 xliguse1"
-./wofm2opl $tests/xliguse1 $tests/xliguse1 || exit 1
+$_wofm2opl $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"
-./wopl2ofm $tests/xliguse1 $tests/xliguse2 || exit 1
+$_wopl2ofm $tests/xliguse1 $tests/xliguse2 || rc=15
echo && echo "*** ofm2opl xliguse2 xliguse2"
-./wofm2opl $tests/xliguse2 $tests/xliguse2 || exit 1
+./wofm2opl $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
Modified: trunk/Build/source/texk/web2c/omegaware/odvicopy.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/odvicopy.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/odvicopy.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,17 +4,31 @@
# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+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
test -d $tests || mkdir -p $tests
+rc=0
echo && echo "*** odvicopy -help"
-./odvicopy -help || exit 1
+$_odvicopy -help || rc=1
echo && echo "*** odvicopy -version"
-./odvicopy -version || exit 1
+$_odvicopy -version || rc=2
# Test page selection
#
@@ -21,11 +35,11 @@
echo && echo "*** odvicopy --p=*.*.2 --max=1 pagenum.dvi xpagenum.dvi >xpagenum.log"
TEXMFCNF=$srcdir/../kpathsea \
TFMFONTS=$srcdir/tests \
- ./odvicopy --p=\*.\*.2 --max=1 $srcdir/tests/pagenum.dvi $tests/xpagenum.dvi \
- >$tests/xpagenum.log || exit 1
+ $_odvicopy --p=\*.\*.2 --max=1 $srcdir/tests/pagenum.dvi $tests/xpagenum.dvi \
+ >$tests/xpagenum.log || rc=3
echo && echo "*** grep '1 page written\.$' xpagenum.log"
-grep '1 page written\.$' $tests/xpagenum.log || exit 1
+grep '1 page written\.$' $tests/xpagenum.log || rc=4
# First a straight copy
#
@@ -35,14 +49,14 @@
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=$srcdir/$tests \
OVFFONTS=. \
- ./odvicopy $srcdir/$tests/ofontd0 $tests/xofontd1 || exit 1
+ $_odvicopy $srcdir/$tests/ofontd0 $tests/xofontd1 || rc=5
echo && echo "*** odvitype xofontd1 >xofontd1.typ"
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=$srcdir/$tests \
- ./odvitype $tests/xofontd1 | sed '1s/ (.*)$//' >$tests/xofontd1.typ || exit 1
+ $_odvitype $tests/xofontd1 | sed '1s/ (.*)$//' >$tests/xofontd1.typ || rc=6
-diff $srcdir/$tests/ofontd1.typ $tests/xofontd1.typ || exit 1
+$DIFF $srcdir/$tests/ofontd1.typ $tests/xofontd1.typ || rc=7
# Next with VF/OVF files for ofontv[4-6]
#
@@ -52,14 +66,14 @@
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=$srcdir/$tests \
OVFFONTS=. \
- ./odvicopy $tests/xofontd1 $tests/xofontd2 || exit 1
+ $_odvicopy $tests/xofontd1 $tests/xofontd2 || rc=8
echo && echo "*** odvitype xofontd2 >xofontd2.typ"
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=$srcdir/$tests \
- ./odvitype $tests/xofontd2 | sed '1s/ (.*)$//' >$tests/xofontd2.typ || exit 1
+ $_odvitype $tests/xofontd2 | sed '1s/ (.*)$//' >$tests/xofontd2.typ || rc=9
-diff $srcdir/$tests/ofontd2.typ $tests/xofontd2.typ || exit 1
+$DIFF $srcdir/$tests/ofontd2.typ $tests/xofontd2.typ || rc=10
# Finally with VF/OVF files for ofontr[1-3] and ofontv[4-6]
#
@@ -69,14 +83,14 @@
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=$srcdir/$tests \
OVFFONTS=. \
- ./odvicopy $srcdir/$tests/ofontd0 $tests/xofontd3 || exit 1
+ $_odvicopy $srcdir/$tests/ofontd0 $tests/xofontd3 || rc=11
echo && echo "*** odvitype xofontd3 >xofontd3.typ"
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=$srcdir/$tests \
- ./odvitype $tests/xofontd3 | sed '1s/ (.*)$//' >$tests/xofontd3.typ || exit 1
+ $_odvitype $tests/xofontd3 | sed '1s/ (.*)$//' >$tests/xofontd3.typ || rc=12
-diff $srcdir/$tests/ofontd3.typ $tests/xofontd3.typ || exit 1
+$DIFF $srcdir/$tests/ofontd3.typ $tests/xofontd3.typ || rc=13
-exit 0
+exit $rc
Modified: trunk/Build/source/texk/web2c/omegaware/odvitype.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/odvitype.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/odvitype.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,6 +4,18 @@
# Copyright 2009 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+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
@@ -12,7 +24,7 @@
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=$srcdir/$tests \
- ./odvitype $srcdir/$tests/ofontd0 | sed '1s/ (.*)$//' >$tests/xofontd0.typ || exit 1
+ $_odvitype $srcdir/$tests/ofontd0 | sed '1s/ (.*)$//' >$tests/xofontd0.typ || exit 1
-diff $srcdir/$tests/ofontd0.typ $tests/xofontd0.typ || exit 1
+$DIFF $srcdir/$tests/ofontd0.typ $tests/xofontd0.typ || exit 2
Modified: trunk/Build/source/texk/web2c/omegaware/ofonts.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/ofonts.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/ofonts.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,58 +4,72 @@
# Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_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
+rc=0
VPL='ofontr1 ofontv4'
OVP='ofontr2 ofontr3 ofontv5 ofontv6'
for f in $VPL; do
- ./wopl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || exit 1
+ $_wopl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || rc=1
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
- diff $srcdir/$tests/$f.pl $tests/x$f.pl || exit 1
+ $_wofm2opl -verbose $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
- ./wopl2ofm -verbose $srcdir/$tests/$f $tests/x$f || exit 1
+ $_wopl2ofm -verbose $srcdir/$tests/$f $tests/x$f || rc=4
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/x$f $tests/x$f || exit 1
- diff $srcdir/$tests/$f.opl $tests/x$f.opl || exit 1
+ $_wofm2opl -verbose $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*
for f in ofontr0; do
- ./wopl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || exit 1
+ $_wopl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || rc=7
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
- diff $srcdir/$tests/$f.pl $tests/x$f.pl || exit 1
+ $_wofm2opl -verbose $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
- ./wovp2ovf -verbose $srcdir/$tests/$f.vpl $tests/x$f.vf $tests/x$f.tfm || exit 1
+ $_wovp2ovf -verbose $srcdir/$tests/$f.vpl $tests/x$f.vf $tests/x$f.tfm || rc=10
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
- diff $srcdir/$tests/$f.pl $tests/x$f.pl || exit 1
+ $_wofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || rc=11
+ diff $srcdir/$tests/$f.pl $tests/x$f.pl || rc=12
TEXMFCNF=$srcdir/../kpathsea \
- OFMFONTS=.:$srcdir/$tests \
- ./wovf2ovp -verbose $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
+ OFMFONTS=".;$srcdir/$tests" \
+ $_wovf2ovp -verbose $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
- ./wovp2ovf -verbose $srcdir/$tests/$f $tests/x$f $tests/x$f || exit 1
+ $_wovp2ovf -verbose $srcdir/$tests/$f $tests/x$f $tests/x$f || rc=15
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/x$f $tests/x$f || exit 1
- diff $srcdir/$tests/$f.opl $tests/x$f.opl || exit 1
+ $_wofm2opl -verbose $tests/x$f $tests/x$f || rc=16
+ diff $srcdir/$tests/$f.opl $tests/x$f.opl || rc=17
TEXMFCNF=$srcdir/../kpathsea \
- OFMFONTS=.:$srcdir/$tests \
- ./wovf2ovp -verbose $tests/x$f $tests/x$f $tests/x$f || exit 1
- diff $srcdir/$tests/$f.ovp $tests/x$f.ovp || exit 1
+ OFMFONTS=".;$srcdir/$tests" \
+ $_wovf2ovp -verbose $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
Modified: trunk/Build/source/texk/web2c/omegaware/omfonts.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/omfonts.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/omfonts.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,34 +4,45 @@
# Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pltotf=$BinDir/pltotf$ExeExt
+_tftopl=$BinDir/tftopl$ExeExt
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
+rc=0
-./pltotf $srcdir/$tests/Cherokee $tests/Cherokee || exit 1
+$_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 \
- ./wovp2ovf -verbose $srcdir/$tests/OCherokee $tests/OCherokee $tests/OCherokee || exit 1
+ $_wovp2ovf -verbose $srcdir/$tests/OCherokee $tests/OCherokee $tests/OCherokee || rc=4
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/OCherokee $tests/OCherokee || exit 1
+ $_wofm2opl -verbose $tests/OCherokee $tests/OCherokee || rc=5
-./wopl2ofm -verbose $tests/OCherokee $tests/xOCherokee || exit 1
+$_wopl2ofm -verbose $tests/OCherokee $tests/xOCherokee || rc=6
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/xOCherokee $tests/xOCherokee || exit 1
+ $_wofm2opl -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 \
- ./wovf2ovp -verbose $tests/OCherokee $tests/OCherokee $tests/xOCherokee || exit 1
+ OFMFONTS=".;./$tests" \
+ $_wovf2ovp -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
Modified: trunk/Build/source/texk/web2c/omegaware/otangle.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/otangle.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/otangle.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,11 +4,15 @@
# Copyright 2009-2013 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_otangle=$BinDir/otangle$ExeExt
+
rm -rf ocftest.*
cp $srcdir/cftests/cftest.web ./ocftest.web
-TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=.:$srcdir/cftests \
- ./otangle ocftest cftest || exit 1
+TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=".;$srcdir/cftests" \
+ $_otangle ocftest cftest || exit 1
-diff ocftest.p $srcdir/cftests/ocftest.p || exit 1
+diff ocftest.p $srcdir/cftests/ocftest.p || exit 2
Modified: trunk/Build/source/texk/web2c/omegaware/overbmp.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/overbmp.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/overbmp.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,52 +4,69 @@
# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_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
test -d $tests || mkdir -p $tests
+rc=0
TEXMFCNF=$srcdir/../kpathsea
OFMFONTS=./$tests
export TEXMFCNF OFMFONTS
-./wopl2ofm -verbose $srcdir/$tests/inbmp $tests/xinbmp || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/inbmp $tests/xinbmp || rc=1
-./wofm2opl -verbose xinbmp $tests/xinbmp || exit 1
+$_wofm2opl -verbose 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
-./wovp2ovf -verbose $srcdir/$tests/overbmp.ovp $tests/xoverbmp || exit 1
+$_wovp2ovf -verbose $srcdir/$tests/overbmp.ovp $tests/xoverbmp || rc=4
-./wofm2opl -verbose xoverbmp $tests/xoverbmp || exit 1
+$_wofm2opl -verbose 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
-./wovf2ovp -verbose $tests/xoverbmp xoverbmp $tests/xoverbmp.ovp || exit 1
+$_wovf2ovp -verbose $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
-./wopl2ofm -verbose $tests/xinbmp1 $tests/xinbmp1 || exit 1
+$_wopl2ofm -verbose $tests/xinbmp1 $tests/xinbmp1 || rc=9
-./wofm2opl -verbose xinbmp1 $tests/xinbmp2 || exit 1
+$_wofm2opl -verbose 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
-./wovp2ovf -verbose $tests/xoverbmp1.ovp $tests/xoverbmp1 || exit 1
+$_wovp2ovf -verbose $tests/xoverbmp1.ovp $tests/xoverbmp1 || rc=12
sed -e '/OFMLEVEL/s/H 1/H 0/' $tests/xoverbmp.opl >$tests/xoverbmp1.opl
-./wofm2opl -verbose xoverbmp1 $tests/xoverbmp2 || exit 1
+$_wofm2opl -verbose xoverbmp1 $tests/xoverbmp2 || rc=13
-diff $tests/xoverbmp1.opl $tests/xoverbmp2.opl || exit 1
+$DIFF $tests/xoverbmp1.opl $tests/xoverbmp2.opl || rc=14
-./wovf2ovp -verbose $tests/xoverbmp1 xoverbmp1 $tests/xoverbmp2 || exit 1
+$_wovf2ovp -verbose $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
Modified: trunk/Build/source/texk/web2c/omegaware/realnum.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/realnum.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/realnum.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,6 +4,11 @@
# Copyright 2012-2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
@@ -12,9 +17,9 @@
OFMFONTS=./$tests
export TEXMFCNF OFMFONTS
-./wopl2ofm -verbose $srcdir/$tests/realnum $tests/xrealnum || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/realnum $tests/xrealnum || exit 1
-./wofm2opl -verbose xrealnum $tests/xrealnum || exit 1
+$_wofm2opl -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
Modified: trunk/Build/source/texk/web2c/omegaware/repeat.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/repeat.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/repeat.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,14 +4,19 @@
# Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
-./wopl2ofm -verbose $srcdir/$tests/repeat $tests/xrepeated || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/repeat $tests/xrepeated || exit 1
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/xrepeated $tests/xrepeated || exit 1
+ $_wofm2opl -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
Modified: trunk/Build/source/texk/web2c/omegaware/selectfont.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/selectfont.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/selectfont.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,31 +4,48 @@
# Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_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
+rc=0
TEXMFCNF=$srcdir/../kpathsea
OFMFONTS=./$tests
export TEXMFCNF OFMFONTS
-./wopl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample0-h || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample0-h || rc=1
-./wopl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample1-h || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample1-h || rc=2
-./wofm2opl -verbose sample1-h $tests/sample1-h || exit 1
+$_wofm2opl -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
-./wovp2ovf -verbose $srcdir/$tests/sample $tests/sample $tests/sample || exit 1
+$_wovp2ovf -verbose $srcdir/$tests/sample $tests/sample $tests/sample || rc=5
-./wovf2ovp -verbose $tests/sample sample $tests/xsample.out || exit 1
+$_wovf2ovp -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
-./wovp2ovf -verbose $srcdir/$tests/sample.ovp $tests/sample2.ovf || exit 1
+$_wovp2ovf -verbose $srcdir/$tests/sample.ovp $tests/sample2.ovf || rc=8
-./wovf2ovp -verbose $tests/sample2 sample2 >$tests/xsample2.out || exit 1
+$_wovf2ovp -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
Modified: trunk/Build/source/texk/web2c/omegaware/shorten.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/shorten.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/shorten.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,6 +4,15 @@
# Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pltotf=$BinDir/pltotf$ExeExt
+_odvitype=$BinDir/odvitype$ExeExt
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
@@ -12,16 +21,16 @@
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 "wofm2opl $tests/shorten.tfm $tests/shortend.pl" && \
- ./wofm2opl $tests/shortend.tfm $tests/shortend.pl || exit
+ $_wofm2opl $tests/shortend.tfm $tests/shortend.pl || exit
echo && echo "wopl2ofm $tests/shorten $tests/shortend" && \
- ./wopl2ofm $srcdir/$tests/shorten $tests/shortend || exit
+ $_wopl2ofm $srcdir/$tests/shorten $tests/shortend || exit
echo && echo "wofm2opl $tests/shorten $tests/shortend" && \
- ./wofm2opl $tests/shortend $tests/shortend || exit
+ $_wofm2opl $tests/shortend $tests/shortend || exit
diff $tests/shortend.pl $tests/shortend.opl || exit
Modified: trunk/Build/source/texk/web2c/omegaware/specialhex.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/specialhex.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/specialhex.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,27 +4,36 @@
# Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
+rc=0
TEXMFCNF=$srcdir/../kpathsea \
OFMFONTS=./$tests \
- ./wovp2ovf -verbose $srcdir/$tests/specialhex $tests/specialhex $tests/specialhex || exit 1
+ $_wovp2ovf -verbose $srcdir/$tests/specialhex $tests/specialhex $tests/specialhex || rc=1
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/specialhex $tests/specialhex || exit 1
+ $_wofm2opl -verbose $tests/specialhex $tests/specialhex || rc=2
-./wopl2ofm -verbose $tests/specialhex $tests/xspecialhex || exit 1
+$_wopl2ofm -verbose $tests/specialhex $tests/xspecialhex || rc=3
TEXMFCNF=$srcdir/../kpathsea \
- ./wofm2opl -verbose $tests/xspecialhex $tests/xspecialhex || exit 1
+ $_wofm2opl -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 \
- ./wovf2ovp -verbose $tests/specialhex $tests/specialhex $tests/xspecialhex || exit 1
+ OFMFONTS=".;./$tests" \
+ $_wovf2ovp -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
Modified: trunk/Build/source/texk/web2c/omegaware/version.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/version.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/version.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,15 +4,21 @@
# Copyright 2015 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
echo && echo "*** ofm2opl -version"
-./wofm2opl -version || exit 1
+$_wofm2opl -version || exit 1
echo && echo "*** opl2ofm -version"
-./wopl2ofm -version || exit 1
+$_wopl2ofm -version || exit 2
echo && echo "*** ovf2ovp -version"
-./wovf2ovp -version || exit 1
+$_wovf2ovp -version || exit 3
echo && echo "*** ovp2ovf -version"
-./wovp2ovf -version || exit 1
-
+$_wovp2ovf -version || exit 4
Modified: trunk/Build/source/texk/web2c/omegaware/vrepeat.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/vrepeat.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/vrepeat.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,6 +4,13 @@
# Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
tests=omegaware/tests
TEXMFCNF=$srcdir/../kpathsea
@@ -11,34 +18,35 @@
export TEXMFCNF OFMFONTS
test -d $tests || mkdir -p $tests
+rc=0
echo 'opl2ofm -verbose vrepeat0 yrepeat0'
-./wopl2ofm -verbose $srcdir/$tests/vrepeat0 $tests/yrepeat0 && \
- cmp $srcdir/$tests/vrepeat0.ofm $tests/yrepeat0.ofm && echo || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/vrepeat0 $tests/yrepeat0 && \
+ cmp $srcdir/$tests/vrepeat0.ofm $tests/yrepeat0.ofm && echo || rc=1
echo 'ofm2opl -verbose yrepeat0 yrepeat0'
-./wofm2opl -verbose $tests/yrepeat0 $tests/yrepeat0 && \
- diff -u $srcdir/$tests/vrepeat0.opl $tests/yrepeat0.opl && echo || exit 1
+$_wofm2opl -verbose $tests/yrepeat0 $tests/yrepeat0 && \
+ diff -u $srcdir/$tests/vrepeat0.opl $tests/yrepeat0.opl && echo || rc=2
echo 'ovp2ovf -verbose vrepeat1 yrepeat1'
-./wovp2ovf -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat1 && \
+$_wovp2ovf -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat1 && \
cmp $srcdir/$tests/vrepeat1.ovf $tests/yrepeat1.ovf && \
- cmp $srcdir/$tests/vrepeat1.ofm $tests/yrepeat1.ofm && echo || exit 1
+ cmp $srcdir/$tests/vrepeat1.ofm $tests/yrepeat1.ofm && echo || rc=3
echo 'ovf2ovp -verbose yrepeat1 yrepeat1 yrepeat1'
-./wovf2ovp -verbose $tests/yrepeat1 yrepeat1 $tests/yrepeat1
- diff -u $srcdir/$tests/vrepeat1.ovp $tests/yrepeat1.ovp && echo || exit 1
+$_wovf2ovp -verbose $tests/yrepeat1 yrepeat1 $tests/yrepeat1
+ diff -u $srcdir/$tests/vrepeat1.ovp $tests/yrepeat1.ovp && echo || rc=4
echo 'ofm2opl -verbose yrepeat1 yrepeat1'
-./wofm2opl -verbose $tests/yrepeat1 $tests/yrepeat1 && \
- diff -u $srcdir/$tests/vrepeat1.opl $tests/yrepeat1.opl && echo || exit 1
+$_wofm2opl -verbose $tests/yrepeat1 $tests/yrepeat1 && \
+ diff -u $srcdir/$tests/vrepeat1.opl $tests/yrepeat1.opl && echo || rc=5
echo 'opl2ofm -verbose vrepeat1 yrepeat2'
-./wopl2ofm -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat2 && \
- cmp $srcdir/$tests/vrepeat1.ofm $tests/yrepeat2.ofm && echo || exit 1
+$_wopl2ofm -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat2 && \
+ cmp $srcdir/$tests/vrepeat1.ofm $tests/yrepeat2.ofm && echo || rc=6
echo 'ofm2opl -verbose yrepeat2 yrepeat2'
-./wofm2opl -verbose $tests/yrepeat2 $tests/yrepeat2 && \
- diff -u $srcdir/$tests/vrepeat1.opl $tests/yrepeat2.opl && echo || exit 1
+$_wofm2opl -verbose $tests/yrepeat2 $tests/yrepeat2 && \
+ diff -u $srcdir/$tests/vrepeat1.opl $tests/yrepeat2.opl && echo || rc=7
-exit 0
+exit $rc
Modified: trunk/Build/source/texk/web2c/omegaware/yannis.test
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/yannis.test 2023-08-13 12:49:53 UTC (rev 67906)
+++ trunk/Build/source/texk/web2c/omegaware/yannis.test 2023-08-13 13:50:50 UTC (rev 67907)
@@ -4,9 +4,18 @@
# Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pltotf=$BinDir/pltotf$ExeExt
+_wofm2opl=$BinDir/wofm2opl$ExeExt
+_wopl2ofm=$BinDir/wopl2ofm$ExeExt
+_wovf2ovp=$BinDir/wovf2ovp$ExeExt
+_wovp2ovf=$BinDir/wovp2ovf$ExeExt
+
tests=omegaware/tests
test -d $tests || mkdir -p $tests
+rc=0
TEXMFCNF=$srcdir/../kpathsea
OFMFONTS=".;./$tests"
@@ -13,53 +22,54 @@
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"
-./wopl2ofm $srcdir/$tests/arabicr.pl $tests/zyarabicr || exit 1
+$_wopl2ofm $srcdir/$tests/arabicr.pl $tests/zyarabicr || rc=2
echo && echo "*** cmp yarabicr.tfm zyarabicr.ofm"
-cmp $tests/yarabicr.tfm $tests/zyarabicr.ofm || exit 1
+cmp $tests/yarabicr.tfm $tests/zyarabicr.ofm || rc=3
echo && echo "*** ofm2opl yarabicr.tfm xyarabicr"
-./wofm2opl $tests/yarabicr.tfm $tests/xyarabicr || exit 1
+$_wofm2opl $tests/yarabicr.tfm $tests/xyarabicr || rc=4
echo && echo "*** ofm2opl zyarabicr zyarabicr"
-./wofm2opl $tests/zyarabicr $tests/zyarabicr || exit 1
+$_wofm2opl $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"
-./wovp2ovf $srcdir/$tests/arabic $tests/yarabic $tests/yarabic || exit 1
+$_wovp2ovf $srcdir/$tests/arabic $tests/yarabic $tests/yarabic || rc=7
echo && echo "*** ofm2opl yarabic xyarabic"
-./wofm2opl $tests/yarabic $tests/xyarabic || exit 1
+$_wofm2opl $tests/yarabic $tests/xyarabic || rc=8
echo && echo "*** opl2ofm xyarabic xyarabic"
-./wopl2ofm $tests/xyarabic $tests/xyarabic || exit 1
+$_wopl2ofm $tests/xyarabic $tests/xyarabic || rc=9
echo && echo "*** ofm2opl xyarabic yyarabic"
-./wofm2opl $tests/xyarabic $tests/yyarabic || exit 1
+$_wofm2opl $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"
-./wovf2ovp $tests/yarabic $tests/yarabic $tests/yyarabic || exit 1
+$_wovf2ovp $tests/yarabic $tests/yarabic $tests/yyarabic || rc=12
echo && echo "*** ovp2ovf yyarabic yyarabic yyarabic"
-./wovp2ovf $tests/yyarabic $tests/yyarabic $tests/yyarabic || exit 1
+$_wovp2ovf $tests/yyarabic $tests/yyarabic $tests/yyarabic || rc=13
echo && echo "*** ofm2opl yyarabic xyarabic"
-./wofm2opl $tests/yyarabic $tests/zyarabic || exit 1
+$_wofm2opl $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"
-./wovf2ovp $tests/yyarabic $tests/yyarabic $tests/zyarabic || exit 1
+$_wovf2ovp $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
More information about the tex-live-commits
mailing list.