diff options
author | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-09-03 11:26:37 +0000 |
---|---|---|
committer | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-09-03 11:26:37 +0000 |
commit | 67cd5c06f737714b7225be00da2123ac74091be8 (patch) | |
tree | 99ca0cc2f60690689ba4c01b3bed6d52d4cb2aed /Build | |
parent | 57978920f867297efcced21e00f0030b683f121d (diff) |
web2c: Make easier to test on Windows
git-svn-id: svn://tug.org/texlive/trunk@68157 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
24 files changed, 189 insertions, 64 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 27cb798947a..486e2fe4dca 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2023-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * {tangle,dvicopy,dvitype,gftodvi,gftopk,gftype,mft, + patgen,pktogf,pktype,pltotf,pooltype,tftopl,vftovp, + vptovf,weave}.test: + Make easier to test on Windows. + 2023-08-20 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * {mftraptest,triptest}.test: diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog index adb0c689914..9161b12edc8 100644 --- a/Build/source/texk/web2c/ctiedir/ChangeLog +++ b/Build/source/texk/web2c/ctiedir/ChangeLog @@ -1,3 +1,7 @@ +2023-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * ctie.test: Make easier to test on Windows. + 2023-05-21 Andreas Scherer <https://ascherer.github.io> * ctie-k.ch: Handle deletion of last line in 'master' file. diff --git a/Build/source/texk/web2c/ctiedir/ctie.test b/Build/source/texk/web2c/ctiedir/ctie.test index fea758881d3..1289ee1c13f 100755 --- a/Build/source/texk/web2c/ctiedir/ctie.test +++ b/Build/source/texk/web2c/ctiedir/ctie.test @@ -4,17 +4,21 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_ctie=$BinDir/ctie$ExeExt + TEXMFCNF=$srcdir/../kpathsea \ CWEBINPUTS=$srcdir/ctiedir \ - ./ctie -c ctie.outc ctie.tie ctie.cf1 ctie.cf2 ctie.cf3 || exit 1 + $_ctie -c ctie.outc ctie.tie ctie.cf1 ctie.cf2 ctie.cf3 || exit 1 -diff ctie.outc $srcdir/ctiedir/ctie.chf.gen || exit 1 +diff ctie.outc $srcdir/ctiedir/ctie.chf.gen || exit 2 TEXMFCNF=$srcdir/../kpathsea \ CWEBINPUTS=$srcdir/ctiedir \ - ./ctie -m ctie.outm ctie.tie ctie.cf1 ctie.cf2 ctie.cf3 || exit 1 + $_ctie -m ctie.outm ctie.tie ctie.cf1 ctie.cf2 ctie.cf3 || exit 3 -diff ctie.outm $srcdir/ctiedir/ctie.master.gen || exit 1 +diff ctie.outm $srcdir/ctiedir/ctie.master.gen || exit 4 diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 4fd7c570104..ed2250885fc 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,7 @@ +2023-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * {ctwill,cweave}.test: Make easier to test on Windows. + 2023-08-30 Andreas Scherer <https://ascherer.github.io> * ctwill-proofsort, diff --git a/Build/source/texk/web2c/cwebdir/ctwill.test b/Build/source/texk/web2c/cwebdir/ctwill.test index 7944d19c6cc..26697ce121d 100755 --- a/Build/source/texk/web2c/cwebdir/ctwill.test +++ b/Build/source/texk/web2c/cwebdir/ctwill.test @@ -3,26 +3,40 @@ # Copyright 2023 Andreas Scherer <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_ctwill=$BinDir/ctwill$ExeExt +_ctwill_refsort=$BinDir/ctwill-refsort$ExeExt +_ctwill_twinx=$BinDir/ctwill-twinx$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 + testdir=$srcdir/cwebdir/tests # Test CTWILL by running it twice -CWEBINPUTS=$testdir ./ctwill ham ham || exit 1 -CWEBINPUTS=$testdir ./ctwill ham ham || exit 1 -diff ham.tex $testdir/ham.tex || exit 1 +CWEBINPUTS=$testdir $_ctwill ham ham || exit 1 +CWEBINPUTS=$testdir $_ctwill ham ham || exit 2 +diff ham.tex $testdir/ham.tex || exit 3 # Test CTWILL-REFSORT -./ctwill-refsort < $testdir/ham.ref > ham.sref || exit 1 -diff ham.sref $testdir/ham.sref || exit 1 +$_ctwill_refsort < $testdir/ham.ref > ham.sref || exit 4 +$DIFF ham.sref $testdir/ham.sref || exit 5 # Test CTWILL-TWINX -./ctwill-twinx ham.tex > index.tex -diff index.tex $testdir/index.tex || exit 1 +$_ctwill_twinx ham.tex > index.tex +$DIFF index.tex $testdir/index.tex || exit 6 # Test CTWILL-PROOFSORT # Perl script not available in builddir, and requires Unicode::Collate; # if that module is not available, just quit testing. perl -e 'use Unicode::Collate; Unicode::Collate->new();' 2>/dev/null || exit 0 -$testdir/../ctwill-proofsort ham.tex > ham-sorted.tex || exit 1 -diff ham-sorted.tex $testdir/ham-sorted.tex || exit 1 +$testdir/../ctwill-proofsort ham.tex > ham-sorted.tex || exit 7 +$DIFF ham-sorted.tex $testdir/ham-sorted.tex || exit 8 exit 0 diff --git a/Build/source/texk/web2c/cwebdir/cweave.test b/Build/source/texk/web2c/cwebdir/cweave.test index b20b5b9da29..7d2e05c94d8 100755 --- a/Build/source/texk/web2c/cwebdir/cweave.test +++ b/Build/source/texk/web2c/cwebdir/cweave.test @@ -4,6 +4,10 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_cweave=$BinDir/cweave$ExeExt + TEXMFCNF=$srcdir/../kpathsea \ - CWEBINPUTS=$srcdir/cwebdir ./cweave common.w || exit 1 + CWEBINPUTS=$srcdir/cwebdir $_cweave common.w || exit 1 diff --git a/Build/source/texk/web2c/dvicopy.test b/Build/source/texk/web2c/dvicopy.test index 07e61ed14a3..6e86da1248c 100755 --- a/Build/source/texk/web2c/dvicopy.test +++ b/Build/source/texk/web2c/dvicopy.test @@ -4,13 +4,17 @@ # Copyright 2009-2012 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_dvicopy=$BinDir/dvicopy$ExeExt + test -d tests || mkdir -p tests if tfmpath=`$KPSEWHICH cmbx10.tfm`; then TEXMFCNF=$srcdir/../kpathsea \ TFMFONTS=`dirname "$tfmpath"` \ - ./dvicopy $srcdir/tests/story tests/xstory.dvi || exit 1 + $_dvicopy $srcdir/tests/story tests/xstory.dvi || exit 1 fi @@ -18,5 +22,5 @@ fi (TEXMFCNF=$srcdir/../kpathsea \ TFMFONTS=$srcdir/tests \ VFFONTS=$srcdir/tests \ - ./dvicopy <$srcdir/tests/pplr.dvi >tests/xpplr.dvi) 2>&1 || exit 1 + $_dvicopy <$srcdir/tests/pplr.dvi >tests/xpplr.dvi) 2>&1 || exit 2 diff --git a/Build/source/texk/web2c/dvitype.test b/Build/source/texk/web2c/dvitype.test index 0ace0379ca7..bccdda2ea93 100755 --- a/Build/source/texk/web2c/dvitype.test +++ b/Build/source/texk/web2c/dvitype.test @@ -4,17 +4,21 @@ # Copyright 2009-2012 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_dvitype=$BinDir/dvitype$ExeExt + test -d tests || mkdir -p tests if tfmpath=`$KPSEWHICH cmbx10.tfm`; then TEXMFCNF=$srcdir/../kpathsea \ TFMFONTS=`dirname "$tfmpath"` \ - ./dvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1 + $_dvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1 fi TEXMFCNF=$srcdir/../kpathsea \ TFMFONTS=$srcdir/tests \ - ./dvitype --p=\*.\*.2 $srcdir/tests/pagenum.dvi >tests/xpagenum.typ || exit 1 + $_dvitype --p=\*.\*.2 $srcdir/tests/pagenum.dvi >tests/xpagenum.typ || exit 2 diff --git a/Build/source/texk/web2c/gftodvi.test b/Build/source/texk/web2c/gftodvi.test index abe5fac374d..6826d1a5d4c 100755 --- a/Build/source/texk/web2c/gftodvi.test +++ b/Build/source/texk/web2c/gftodvi.test @@ -4,10 +4,14 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_gftodvi=$BinDir/gftodvi$ExeExt + test -d tests || mkdir -p tests TEXMFCNF=$srcdir/../kpathsea \ TFMFONTS=$srcdir/tests \ - ./gftodvi -verbose $srcdir/tests/cmr10.600gf && \ + $_gftodvi -verbose $srcdir/tests/cmr10.600gf && \ mv cmr10.dvi tests/xcmr10.dvi|| exit 1 diff --git a/Build/source/texk/web2c/gftopk.test b/Build/source/texk/web2c/gftopk.test index 38649e1ced7..f81a6d21071 100755 --- a/Build/source/texk/web2c/gftopk.test +++ b/Build/source/texk/web2c/gftopk.test @@ -4,10 +4,14 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_gftopk=$BinDir/gftopk$ExeExt + test -d tests || mkdir -p tests TEXMFCNF=$srcdir/../kpathsea \ - ./gftopk -verbose $srcdir/tests/cmr10.600gf tests/xcmr10.pk || exit 1 + $_gftopk -verbose $srcdir/tests/cmr10.600gf tests/xcmr10.pk || exit 1 TEXMFCNF=$srcdir/../kpathsea \ - ./gftopk $srcdir/tests/cmr10.600gf cmr10.pk && rm cmr10.pk || exit 1 + $_gftopk $srcdir/tests/cmr10.600gf cmr10.pk && rm cmr10.pk || exit 2 diff --git a/Build/source/texk/web2c/gftype.test b/Build/source/texk/web2c/gftype.test index 1daebf41c2c..6f2ed6683b5 100755 --- a/Build/source/texk/web2c/gftype.test +++ b/Build/source/texk/web2c/gftype.test @@ -4,11 +4,15 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_gftype=$BinDir/gftype$ExeExt + test -d tests || mkdir -p tests TEXMFCNF=$srcdir/../kpathsea \ - ./gftype $srcdir/tests/cmr10.600gf >tests/xcmr10.gft1 || exit 1 + $_gftype $srcdir/tests/cmr10.600gf >tests/xcmr10.gft1 || exit 1 TEXMFCNF=$srcdir/../kpathsea \ - ./gftype -m -i $srcdir/tests/cmr10.600gf >tests/xcmr10.gft2 || exit 1 + $_gftype -m -i $srcdir/tests/cmr10.600gf >tests/xcmr10.gft2 || exit 2 diff --git a/Build/source/texk/web2c/mft.test b/Build/source/texk/web2c/mft.test index 787b642c3e2..96fcafd286c 100755 --- a/Build/source/texk/web2c/mft.test +++ b/Build/source/texk/web2c/mft.test @@ -4,9 +4,13 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_mft=$BinDir/mft$ExeExt + test -d tests || mkdir -p tests TEXMFCNF=$srcdir/../kpathsea \ MFTINPUTS=$srcdir/tests \ - ./mft $srcdir/tests/io && mv -f io.tex tests/io.tex || exit 1 + $_mft $srcdir/tests/io && mv -f io.tex tests/io.tex || exit 1 diff --git a/Build/source/texk/web2c/patgen.test b/Build/source/texk/web2c/patgen.test index c85d2af1d4d..db6453a4ebb 100755 --- a/Build/source/texk/web2c/patgen.test +++ b/Build/source/texk/web2c/patgen.test @@ -4,8 +4,12 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_patgen=$BinDir/patgen$ExeExt + test -d tests || mkdir -p tests -./patgen $srcdir/tests/dict $srcdir/tests/patterns tests/xpatout \ +$_patgen $srcdir/tests/dict $srcdir/tests/patterns tests/xpatout \ $srcdir/tests/translate <$srcdir/tests/patgen.in || exit 1 diff --git a/Build/source/texk/web2c/pktogf.test b/Build/source/texk/web2c/pktogf.test index 50ceefe5fb3..0790eae9a6f 100755 --- a/Build/source/texk/web2c/pktogf.test +++ b/Build/source/texk/web2c/pktogf.test @@ -4,11 +4,15 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_pktogf=$BinDir/pktogf$ExeExt + test -d tests || mkdir -p tests TEXMFCNF=$srcdir/../kpathsea \ - ./pktogf -verbose $srcdir/tests/cmr10.pk tests/xcmr10.600gf || exit 1 + $_pktogf -verbose $srcdir/tests/cmr10.pk tests/xcmr10.600gf || exit 1 TEXMFCNF=$srcdir/../kpathsea \ - ./pktogf $srcdir/tests/cmr10.pk && rm cmr10.gf || exit 1 + $_pktogf $srcdir/tests/cmr10.pk && rm cmr10.gf || exit 2 diff --git a/Build/source/texk/web2c/pktype.test b/Build/source/texk/web2c/pktype.test index fed5e735f51..fdf88c97c22 100755 --- a/Build/source/texk/web2c/pktype.test +++ b/Build/source/texk/web2c/pktype.test @@ -4,8 +4,12 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_pktype=$BinDir/pktype$ExeExt + test -d tests || mkdir -p tests TEXMFCNF=$srcdir/../kpathsea \ - ./pktype $srcdir/tests/cmr10.pk >tests/xcmr10.pktyp || exit 1 + $_pktype $srcdir/tests/cmr10.pk >tests/xcmr10.pktyp || exit 1 diff --git a/Build/source/texk/web2c/pltotf.test b/Build/source/texk/web2c/pltotf.test index f1d8b0b6466..927173b089d 100755 --- a/Build/source/texk/web2c/pltotf.test +++ b/Build/source/texk/web2c/pltotf.test @@ -4,15 +4,19 @@ # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_pltotf=$BinDir/pltotf$ExeExt + test -d tests || mkdir -p tests -./pltotf -help || exit 1 +$_pltotf -help || exit 1 -./pltotf -version || exit 1 +$_pltotf -version || exit 2 -./pltotf -verbose $srcdir/tests/badpl && exit 1 +$_pltotf -verbose $srcdir/tests/badpl && exit 3 -./pltotf -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1 +$_pltotf -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 4 -cmp $srcdir/tests/cmr10.tfm tests/xcmr10.tfm || exit 1 +cmp $srcdir/tests/cmr10.tfm tests/xcmr10.tfm || exit 5 diff --git a/Build/source/texk/web2c/pooltype.test b/Build/source/texk/web2c/pooltype.test index d1bfd3e7c01..8b98a9b56c1 100755 --- a/Build/source/texk/web2c/pooltype.test +++ b/Build/source/texk/web2c/pooltype.test @@ -4,7 +4,11 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_pooltype=$BinDir/pooltype$ExeExt + test -d tests || mkdir -p tests -./pooltype tex.pool >tests/xtexpool.typ || exit 1 +$_pooltype tex.pool >tests/xtexpool.typ || exit 1 diff --git a/Build/source/texk/web2c/tangle.test b/Build/source/texk/web2c/tangle.test index 5d150d48552..566e1db0d9a 100755 --- a/Build/source/texk/web2c/tangle.test +++ b/Build/source/texk/web2c/tangle.test @@ -4,8 +4,12 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_tangle=$BinDir/tangle$ExeExt + TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=$srcdir/cftests \ - ./tangle cftest cftest || exit 1 + $_tangle cftest cftest || exit 1 -diff cftest.p $srcdir/cftests/cftest.p || exit 1 +diff cftest.p $srcdir/cftests/cftest.p || exit 2 diff --git a/Build/source/texk/web2c/tftopl.test b/Build/source/texk/web2c/tftopl.test index e77a525464b..1361de3a4d8 100755 --- a/Build/source/texk/web2c/tftopl.test +++ b/Build/source/texk/web2c/tftopl.test @@ -4,22 +4,34 @@ # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_tftopl=$BinDir/tftopl$ExeExt + test -d tests || mkdir -p tests -./tftopl -char=foo -help || exit 1 +# 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 + +$_tftopl -char=foo -help || exit 1 -./tftopl -version || exit 1 +$_tftopl -version || exit 2 TEXMFCNF=$srcdir/../kpathsea export TEXMFCNF -./tftopl -verbose $srcdir/tests/badtfm && exit 1 +$_tftopl -verbose $srcdir/tests/badtfm && exit 3 -./tftopl -verbose $srcdir/tests/cmr10 tests/xcmr10a || exit 1 +$_tftopl -verbose $srcdir/tests/cmr10 tests/xcmr10a || exit 4 -diff $srcdir/tests/cmr10.pl tests/xcmr10a.pl || exit 1 +diff $srcdir/tests/cmr10.pl tests/xcmr10a.pl || exit 5 -./tftopl -verbose $srcdir/tests/cmr10 >tests/xcmr10b.pl || exit 1 +$_tftopl -verbose $srcdir/tests/cmr10 >tests/xcmr10b.pl || exit 6 -diff $srcdir/tests/cmr10.pl tests/xcmr10b.pl || exit 1 +$DIFF $srcdir/tests/cmr10.pl tests/xcmr10b.pl || exit 7 diff --git a/Build/source/texk/web2c/tiedir/ChangeLog b/Build/source/texk/web2c/tiedir/ChangeLog index 7c39a2506f9..c584f11eef0 100644 --- a/Build/source/texk/web2c/tiedir/ChangeLog +++ b/Build/source/texk/web2c/tiedir/ChangeLog @@ -1,3 +1,7 @@ +2023-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * tie.test: Make easier to test on Windows. + 2023-05-21 Andreas Scherer <https://ascherer.github.io> * tie-w2c.ch: Handle deletion of last line in 'master' file. diff --git a/Build/source/texk/web2c/tiedir/tie.test b/Build/source/texk/web2c/tiedir/tie.test index 5d71efe129c..fdac4b1ce63 100755 --- a/Build/source/texk/web2c/tiedir/tie.test +++ b/Build/source/texk/web2c/tiedir/tie.test @@ -4,15 +4,19 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_tie=$BinDir/tie$ExeExt + TEXMFCNF=$srcdir/../kpathsea \ WEBINPUTS=$srcdir/tiedir \ - ./tie -c tie.outc tie.tie tie.cf1 tie.cf2 tie.cf3 || exit 1 + $_tie -c tie.outc tie.tie tie.cf1 tie.cf2 tie.cf3 || exit 1 -diff tie.outc $srcdir/tiedir/tie.chf.gen || exit 1 +diff tie.outc $srcdir/tiedir/tie.chf.gen || exit 2 TEXMFCNF=$srcdir/../kpathsea \ WEBINPUTS=$srcdir/tiedir \ - ./tie -m tie.outm tie.tie tie.cf1 tie.cf2 tie.cf3 || exit 1 + $_tie -m tie.outm tie.tie tie.cf1 tie.cf2 tie.cf3 || exit 3 -diff tie.outm $srcdir/tiedir/tie.master.gen || exit 1 +diff tie.outm $srcdir/tiedir/tie.master.gen || exit 4 diff --git a/Build/source/texk/web2c/vftovp.test b/Build/source/texk/web2c/vftovp.test index 87f5f3dbe2f..62bb303bc79 100755 --- a/Build/source/texk/web2c/vftovp.test +++ b/Build/source/texk/web2c/vftovp.test @@ -4,23 +4,35 @@ # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_vftovp=$BinDir/vftovp$ExeExt + test -d tests || mkdir -p tests -./vftovp -char=bar -help || exit 1 +# 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 + +$_vftovp -char=bar -help || exit 1 -./vftovp -version || exit 1 +$_vftovp -version || exit 2 TEXMFCNF=$srcdir/../kpathsea TFMFONTS=$srcdir/tests export TEXMFCNF TFMFONTS -./vftovp -verbose $srcdir/tests/badvf && exit 1 +$_vftovp -verbose $srcdir/tests/badvf && exit 3 -./vftovp -verbose $srcdir/tests/ptmr ptmr tests/xptmra || exit 1 +$_vftovp -verbose $srcdir/tests/ptmr ptmr tests/xptmra || exit 4 -diff $srcdir/tests/ptmr.vpl tests/xptmra.vpl || exit 1 +diff $srcdir/tests/ptmr.vpl tests/xptmra.vpl || exit 5 -./vftovp -verbose $srcdir/tests/ptmr ptmr >tests/xptmrb.vpl || exit 1 +$_vftovp -verbose $srcdir/tests/ptmr ptmr >tests/xptmrb.vpl || exit 6 -diff $srcdir/tests/ptmr.vpl tests/xptmrb.vpl || exit 1 +$DIFF $srcdir/tests/ptmr.vpl tests/xptmrb.vpl || exit 7 diff --git a/Build/source/texk/web2c/vptovf.test b/Build/source/texk/web2c/vptovf.test index f60837cb970..6db5727c00d 100755 --- a/Build/source/texk/web2c/vptovf.test +++ b/Build/source/texk/web2c/vptovf.test @@ -4,26 +4,30 @@ # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_vptovf=$BinDir/vptovf$ExeExt + test -d tests || mkdir -p tests -./vptovf -help || exit 1 +$_vptovf -help || exit 1 -./vptovf -version || exit 1 +$_vptovf -version || exit 2 TEXMFCNF=$srcdir/../kpathsea export TEXMFCNF -./vptovf -verbose $srcdir/tests/badvpl && exit 1 +$_vptovf -verbose $srcdir/tests/badvpl && exit 3 -./vptovf -verbose $srcdir/tests/ptmr tests/yptmr tests/yptmr || exit 1 +$_vptovf -verbose $srcdir/tests/ptmr tests/yptmr tests/yptmr || exit 4 -cmp $srcdir/tests/ptmr.vf tests/yptmr.vf || exit 1 +cmp $srcdir/tests/ptmr.vf tests/yptmr.vf || exit 5 -cmp $srcdir/tests/ptmr.tfm tests/yptmr.tfm || exit 1 +cmp $srcdir/tests/ptmr.tfm tests/yptmr.tfm || exit 6 -./vptovf -verbose $srcdir/tests/ptmr tests/yptmr2.vf || exit 1 +$_vptovf -verbose $srcdir/tests/ptmr tests/yptmr2.vf || exit 7 -cmp $srcdir/tests/ptmr.vf tests/yptmr2.vf || exit 1 +cmp $srcdir/tests/ptmr.vf tests/yptmr2.vf || exit 8 -cmp $srcdir/tests/ptmr.tfm tests/yptmr2.tfm || exit 1 +cmp $srcdir/tests/ptmr.tfm tests/yptmr2.tfm || exit 9 diff --git a/Build/source/texk/web2c/weave.test b/Build/source/texk/web2c/weave.test index 99ddc9d8545..42c36045759 100755 --- a/Build/source/texk/web2c/weave.test +++ b/Build/source/texk/web2c/weave.test @@ -4,8 +4,12 @@ # Copyright 2009 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_weave=$BinDir/weave$ExeExt + test -d tests || mkdir -p tests TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=$srcdir \ - ./weave pooltype || exit 1 + $_weave pooltype || exit 1 |