From 782cea2743858c7266306385e712c8cf84bb7f28 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 13 Dec 2014 11:57:50 +0000 Subject: Check explicitly for trip.fmt/etrip.fmt not being created git-svn-id: svn://tug.org/texlive/trunk@35812 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/eptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/eptexdir/eptriptest | 18 +++++++++++++++++- Build/source/texk/web2c/etexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/etexdir/etriptest | 18 +++++++++++++++++- Build/source/texk/web2c/euptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/euptexdir/euptriptest | 18 +++++++++++++++++- Build/source/texk/web2c/ptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/ptexdir/ptriptest | 6 +++++- Build/source/texk/web2c/uptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/uptexdir/uptriptest | 6 +++++- 10 files changed, 86 insertions(+), 5 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 9ac1f64f20a..bc3c7b9a521 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Peter Breitenlohner + + * eptriptest: Complain early if (e)trip.fmt is not created. + Inspired by report from vvv, tlbuild 14 Jun 2011 10:25:47. + 2014-12-10 Hironori Kitagawa * eptex.ech: Fix bugs in \fontcharwd etc. diff --git a/Build/source/texk/web2c/eptexdir/eptriptest b/Build/source/texk/web2c/eptexdir/eptriptest index d951078955f..03252230010 100755 --- a/Build/source/texk/web2c/eptexdir/eptriptest +++ b/Build/source/texk/web2c/eptexdir/eptriptest @@ -1,7 +1,7 @@ #! /bin/sh # Copyright (C) 2010 Hironori Kitagawa -# Copyright (C) 2011-2013 Peter Breitenlohner +# Copyright (C) 2011-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. testdir=$abs_srcdir/triptrap @@ -40,6 +40,10 @@ $LN_S $testdir/trip.tex . rm -f trip.log ../eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by trip1.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" trip.log > cptripin.log || exit 1 diff $testdir/tripin.log cptripin.log @@ -56,12 +60,18 @@ $DIFF $DIFFFLAGS $testdir/trip.log cptrip.log eval ../dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ +mv trip.fmt ctrip.fmt + # ================================= echo "*** TRIP test for e-pTeX in extended mode ***." rm -f trip.log ../eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by etrip1.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" trip.log > xptripin.log || exit 1 diff $testdir/tripin.log xptripin.log @@ -78,6 +88,8 @@ $DIFF $DIFFFLAGS $testdir/trip.log xptrip.log eval ../dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ +mv trip.fmt xtrip.fmt + # ================================= echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***." @@ -92,6 +104,10 @@ diff $etestdir/etrip.pl etrip.pl || is_OK=false $LN_S $eptestdir/eptrip.tex etrip.tex ../eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot +if test ! -s etrip.fmt; then + echo "*** etrip.fmt not created by etrip2.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" etrip.log > eptripin.log || exit 1 diff $etestdir/etripin.log eptripin.log diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index e84ef676c94..de07fd9014b 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Peter Breitenlohner + + * etriptest: Complain early if (e)trip.fmt is not created. + Inspired by report from vvv, tlbuild 14 Jun 2011 10:25:47. + 2014-05-02 Peter Breitenlohner * etrip/etrip.diffs: Updated for TL14. diff --git a/Build/source/texk/web2c/etexdir/etriptest b/Build/source/texk/web2c/etexdir/etriptest index 4266de6ab46..5f568ff1964 100755 --- a/Build/source/texk/web2c/etexdir/etriptest +++ b/Build/source/texk/web2c/etexdir/etriptest @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2009-2013 Peter Breitenlohner +# Copyright (C) 2009-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. testdir=$abs_srcdir/triptrap @@ -33,6 +33,10 @@ diff $testdir/trip.pl trip.pl || is_OK=false $LN_S $testdir/trip.tex . ../etex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by trip1.in, investigate!" >&2 + exit 1 +fi mv trip.log ctripin.log || exit 1 diff $testdir/tripin.log ctripin.log @@ -48,11 +52,17 @@ $DIFF $DIFFFLAGS $testdir/trip.log ctrip.log eval ../dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ +mv trip.fmt ctrip.fmt + # ============================== echo "*** TRIP test for e-TeX in extended mode ***." ../etex --progname=einitex --ini <$etestdir/etrip1.in >xtripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by etrip1.in, investigate!" >&2 + exit 1 +fi mv trip.log xtripin.log || exit 1 diff ctripin.log xtripin.log @@ -68,6 +78,8 @@ $DIFF $DIFFFLAGS ctrip.log xtrip.log eval ../dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 $DIFF $DIFFFLAGS ctrip.typ xtrip.typ +mv trip.fmt xtrip.fmt + # ============================== echo "*** e-TeX specific part of e-TRIP test ***." @@ -82,6 +94,10 @@ diff $etestdir/etrip.pl etrip.pl || is_OK=false $LN_S $etestdir/etrip.tex . ../etex --progname=einitex --ini <$etestdir/etrip2.in >etripin.fot +if test ! -s etrip.fmt; then + echo "*** etrip.fmt not created by etrip2.in, investigate!" >&2 + exit 1 +fi mv etrip.log etripin.log || exit 1 diff $etestdir/etripin.log etripin.log diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index f3321ea24d5..81af3e95aa9 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Peter Breitenlohner + + * euptriptest: Complain early if (e)trip.fmt is not created. + Inspired by report from vvv, tlbuild 14 Jun 2011 10:25:47. + 2014-11-19 Hironori Kitagawa * euptex.ch1: Fix a bug introduced in the primitive \lastnodechar. diff --git a/Build/source/texk/web2c/euptexdir/euptriptest b/Build/source/texk/web2c/euptexdir/euptriptest index fbff0ce62a0..726cdd41731 100755 --- a/Build/source/texk/web2c/euptexdir/euptriptest +++ b/Build/source/texk/web2c/euptexdir/euptriptest @@ -1,7 +1,7 @@ #! /bin/sh # Copyright (C) 2010 Hironori Kitagawa -# Copyright (C) 2011-2013 Peter Breitenlohner +# Copyright (C) 2011-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. testdir=$abs_srcdir/triptrap @@ -41,6 +41,10 @@ $LN_S $testdir/trip.tex . rm -f trip.log ../euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by trip1.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" trip.log > cuptripin.log || exit 1 diff $testdir/tripin.log cuptripin.log @@ -57,12 +61,18 @@ $DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log eval ../dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ +mv trip.fmt ctrip.fmt + # ================================= echo "*** TRIP test for e-upTeX in extended mode ***." rm -f trip.log ../euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by etrip1.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" trip.log > xuptripin.log || exit 1 diff $testdir/tripin.log xuptripin.log @@ -79,6 +89,8 @@ $DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log eval ../dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ +mv trip.fmt xtrip.fmt + # ================================= echo "*** e-TeX specific part of e-TRIP test for e-upTeX ***." @@ -93,6 +105,10 @@ diff $etestdir/etrip.pl etrip.pl || is_OK=false $LN_S $eptestdir/eptrip.tex etrip.tex ../euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot +if test ! -s etrip.fmt; then + echo "*** etrip.fmt not created by etrip2.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" etrip.log > euptripin.log || exit 1 diff $etestdir/etripin.log euptripin.log diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 555d4f67982..0afc80cd4ac 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Peter Breitenlohner + + * ptriptest: Complain early if trip.fmt is not created. + Inspired by report from vvv, tlbuild 14 Jun 2011 10:25:47. + 2014-05-06 Hironori Kitagawa * ptex-base.ch: reset inhibit_glue_flag in several places diff --git a/Build/source/texk/web2c/ptexdir/ptriptest b/Build/source/texk/web2c/ptexdir/ptriptest index 4b00cd35a55..068731d34ed 100755 --- a/Build/source/texk/web2c/ptexdir/ptriptest +++ b/Build/source/texk/web2c/ptexdir/ptriptest @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010-2013 Peter Breitenlohner +# Copyright (C) 2010-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. testdir=$abs_srcdir/triptrap @@ -38,6 +38,10 @@ $LN_S $testdir/trip.tex . rm -f trip.log ../ptex --progname=pinitex --ini <$testdir/trip1.in >ptripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by trip1.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" trip.log > ptripin.log || exit 1 diff $testdir/tripin.log ptripin.log diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index bae45919502..3ec0a926bc1 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Peter Breitenlohner + + * uptriptest: Complain early if trip.fmt is not created. + Inspired by report from vvv, tlbuild 14 Jun 2011 10:25:47. + 2014-05-02 Peter Breitenlohner * uptrip/uptrip.diffs: Updated for TL14. diff --git a/Build/source/texk/web2c/uptexdir/uptriptest b/Build/source/texk/web2c/uptexdir/uptriptest index e7b384cf825..280880f7675 100755 --- a/Build/source/texk/web2c/uptexdir/uptriptest +++ b/Build/source/texk/web2c/uptexdir/uptriptest @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2011-2013 Peter Breitenlohner +# Copyright (C) 2011-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. testdir=$abs_srcdir/triptrap @@ -38,6 +38,10 @@ $LN_S $testdir/trip.tex . rm -f trip.log ../uptex --progname=upinitex --ini <$testdir/trip1.in >uptripin.fot +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by trip1.in, investigate!" >&2 + exit 1 +fi sed "$P_SED1" trip.log > uptripin.log || exit 1 diff $testdir/tripin.log uptripin.log -- cgit v1.2.3