From 29257ccc28919fcb506e6582fa5078ed0e542f70 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 10 Jul 2015 09:42:52 +0000 Subject: Build system: Better dependencies for 'make check' git-svn-id: svn://tug.org/texlive/trunk@37824 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/uptexdir/ChangeLog | 6 +++ Build/source/texk/web2c/uptexdir/am/uptex.am | 36 +++++++------ Build/source/texk/web2c/uptexdir/uptriptest | 65 ------------------------ Build/source/texk/web2c/uptexdir/uptriptest.test | 65 ++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 81 deletions(-) delete mode 100755 Build/source/texk/web2c/uptexdir/uptriptest create mode 100755 Build/source/texk/web2c/uptexdir/uptriptest.test (limited to 'Build/source/texk/web2c/uptexdir') diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 2a175bdc557..06d104193ac 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,9 @@ +2015-07-10 Peter Breitenlohner + + * uptriptest (removed): Renamed ... + * uptriptest.test (new): ... into this. + * am/uptex.am: Better dependencies for 'make check'. + 2015-06-22 Peter Breitenlohner * am/uptex.am: Use $(tie_c) and $(tie_m). diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 86dd9b27656..40babfa59cc 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -10,18 +10,6 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) upweb_programs = upbibtex updvitype uppltotf uptftopl -# upTeX Tests -uptex_tests = uptexdir/uptriptest -upweb_tests = \ - uptexdir/upbibtex.test \ - uptexdir/updvitype.test \ - uptexdir/uppltotf.test \ - uptexdir/uptftopl.test - -EXTRA_DIST += $(uptex_tests) $(upweb_tests) -DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \ - $(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web) - ## libukanji.a for upTeX and e-upTeX ## EXTRA_LIBRARIES += libukanji.a @@ -161,17 +149,33 @@ uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch $(tie_m) tftopl.web tftopl.ch ptexdir/ptftopl.ch EXTRA_DIST += ptexdir/ptftopl.ch uptexdir/uptftopl.ch -upweb_tests += uptexdir/yokotate.test - ## EXTRA_DIST += \ uptexdir/COPYRIGHT \ uptexdir/COPYRIGHT.jis \ uptexdir/ChangeLog +# upTeX Tests +uptex_tests = uptexdir/uptriptest.test +uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) +upweb_tests = \ + uptexdir/upbibtex.test \ + uptexdir/updvitype.test \ + uptexdir/uppltotf.test \ + uptexdir/uptftopl.test \ + uptexdir/yokotate.test +uptexdir/upbibtex.log: upbibtex$(EXEEXT) +uptexdir/updvitype.log: updvitype$(EXEEXT) +uptexdir/uppltotf.log: uppltotf$(EXEEXT) +uptexdir/uptftopl.log: uptftopl$(EXEEXT) +uptexdir/yokotate.log: uppltotf$(EXEEXT) uptftopl$(EXEEXT) + +EXTRA_DIST += $(uptex_tests) $(upweb_tests) +DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \ + $(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web) + if UPTEX TESTS += $(uptex_tests) -check_PROGRAMS += dvitype pltotf tftopl TRIPTRAP += uptrip.diffs TRIPTRAP_CLEAN += uptrip-clean endif UPTEX @@ -195,7 +199,7 @@ EXTRA_DIST += uptexdir/tests/tmin10.pl uptexdir/tests/tmin10.tfm DISTCLEANFILES += uptests/x*min10.* ## uptexdir/uptriptest EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf -uptrip.diffs: uptex$(EXEEXT) +uptrip.diffs: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ .PHONY: uptrip-clean uptrip-clean: diff --git a/Build/source/texk/web2c/uptexdir/uptriptest b/Build/source/texk/web2c/uptexdir/uptriptest deleted file mode 100755 index 280880f7675..00000000000 --- a/Build/source/texk/web2c/uptexdir/uptriptest +++ /dev/null @@ -1,65 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2011-2014 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -testdir=$abs_srcdir/triptrap -uptestdir=$abs_srcdir/uptexdir/uptrip - -TEXMFCNF=$uptestdir; export TEXMFCNF - -rm -rf uptripdir -mkdir uptripdir -cd uptripdir - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" - -echo ">>> Running TRIP test for upTeX." >&2 -echo ">>> See $uptestdir/uptrip.diffs for example of acceptable diffs." >&2 - -# upTeX outputs direction of boxes. -P_SED1='s/, yoko direction//;s/yoko direction, //' -P_SED2='s/yoko(math) direction, //' - -is_OK=: - -set -x - -echo "*** TRIP test for upTeX ***." - -../pltotf $testdir/trip.pl trip.tfm || exit 1 - -../tftopl ./trip.tfm trip.pl || exit 1 - -diff $testdir/trip.pl trip.pl || is_OK=false - -# get same filename in log -$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 - -# May as well test non-ini second time through. -rm -f trip.log -../uptex --progname=uptex <$testdir/trip2.in >uptrip.fot -sed "$P_SED1;$P_SED2" trip.log > uptrip.log -diff $testdir/trip.fot uptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log uptrip.log - -eval ../dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/uptexdir/uptriptest.test b/Build/source/texk/web2c/uptexdir/uptriptest.test new file mode 100755 index 00000000000..280880f7675 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uptriptest.test @@ -0,0 +1,65 @@ +#! /bin/sh + +# Copyright (C) 2011-2014 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +testdir=$abs_srcdir/triptrap +uptestdir=$abs_srcdir/uptexdir/uptrip + +TEXMFCNF=$uptestdir; export TEXMFCNF + +rm -rf uptripdir +mkdir uptripdir +cd uptripdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running TRIP test for upTeX." >&2 +echo ">>> See $uptestdir/uptrip.diffs for example of acceptable diffs." >&2 + +# upTeX outputs direction of boxes. +P_SED1='s/, yoko direction//;s/yoko direction, //' +P_SED2='s/yoko(math) direction, //' + +is_OK=: + +set -x + +echo "*** TRIP test for upTeX ***." + +../pltotf $testdir/trip.pl trip.tfm || exit 1 + +../tftopl ./trip.tfm trip.pl || exit 1 + +diff $testdir/trip.pl trip.pl || is_OK=false + +# get same filename in log +$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 + +# May as well test non-ini second time through. +rm -f trip.log +../uptex --progname=uptex <$testdir/trip2.in >uptrip.fot +sed "$P_SED1;$P_SED2" trip.log > uptrip.log +diff $testdir/trip.fot uptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log uptrip.log + +eval ../dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + -- cgit v1.2.3