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/euptexdir/ChangeLog | 6 + Build/source/texk/web2c/euptexdir/am/euptex.am | 16 +-- Build/source/texk/web2c/euptexdir/euptriptest | 131 --------------------- Build/source/texk/web2c/euptexdir/euptriptest.test | 131 +++++++++++++++++++++ 4 files changed, 145 insertions(+), 139 deletions(-) delete mode 100755 Build/source/texk/web2c/euptexdir/euptriptest create mode 100755 Build/source/texk/web2c/euptexdir/euptriptest.test (limited to 'Build/source/texk/web2c/euptexdir') diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 1d14cc8853c..3bdb7c84ecc 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,9 @@ +2015-07-10 Peter Breitenlohner + + * euptriptest (removed): Renamed ... + * euptriptest.test (new): ... into this. + * am/euptex.am: Better dependencies for 'make check'. + 2015-07-06 Peter Breitenlohner * am/euptex.am: Add libmd5.a to euptex_DEPENDENCIES. diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index 156a2478d8e..8519bdec014 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -10,12 +10,6 @@ bin_PROGRAMS += euptex endif EUPTEX EXTRA_PROGRAMS += euptex -# e-upTeX Tests -# -euptex_tests = euptexdir/euptriptest - -EXTRA_DIST += $(euptex_tests) - euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 # With --enable-ipc, e-upTeX may need to link with -lsocket. @@ -86,9 +80,15 @@ EXTRA_DIST += \ euptexdir/ChangeLog \ euptexdir/EUPTEX.txt +# e-upTeX Tests +# +euptex_tests = euptexdir/euptriptest.test +euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) + +EXTRA_DIST += $(euptex_tests) + if EUPTEX TESTS += $(euptex_tests) -check_PROGRAMS += dvitype pltotf tftopl TRIPTRAP += euptrip.diffs TRIPTRAP_CLEAN += euptrip-clean endif EUPTEX @@ -101,7 +101,7 @@ EXTRA_DIST += \ eptexdir/eptrip/eptrip.tex \ euptexdir/euptrip/euptrip.diffs \ euptexdir/euptrip/texmf.cnf -euptrip.diffs: euptex$(EXEEXT) +euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ .PHONY: euptrip-clean euptrip-clean: diff --git a/Build/source/texk/web2c/euptexdir/euptriptest b/Build/source/texk/web2c/euptexdir/euptriptest deleted file mode 100755 index 726cdd41731..00000000000 --- a/Build/source/texk/web2c/euptexdir/euptriptest +++ /dev/null @@ -1,131 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 Hironori Kitagawa -# Copyright (C) 2011-2014 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -testdir=$abs_srcdir/triptrap -etestdir=$abs_srcdir/etexdir/etrip -eptestdir=$abs_srcdir/eptexdir/eptrip -euptestdir=$abs_srcdir/euptexdir/euptrip - -TEXMFCNF=$euptestdir; export TEXMFCNF - -rm -rf euptripdir -mkdir euptripdir -cd euptripdir - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" - -echo ">>> Running e-TRIP test for e-upTeX." >&2 -echo ">>> See $euptestdir/euptrip.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 e-upTeX in compatibility mode ***." - -../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 -../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 - -# May as well test non-ini second time through. -rm -f trip.log -../euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot -sed "$P_SED1;$P_SED2" trip.log > cuptrip.log -diff $testdir/trip.fot cuptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$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 - -# May as well test non-ini second time through. -rm -f trip.log -../euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot -sed "$P_SED1;$P_SED2" trip.log > xuptrip.log -diff $testdir/trip.fot xuptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$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 ***." - -../pltotf $etestdir/etrip.pl etrip.tfm || exit 1 - -../tftopl ./etrip.tfm etrip.pl || exit 1 - -diff $etestdir/etrip.pl etrip.pl || is_OK=false - -# get same filename in log -$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 - -# May as well test non-ini second time through. -../euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot -sed "$P_SED1;$P_SED2" etrip.log > euptrip.log -diff $etestdir/etrip.fot euptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/eptrip.log euptrip.log - -eval ../dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 -$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/euptexdir/euptriptest.test b/Build/source/texk/web2c/euptexdir/euptriptest.test new file mode 100755 index 00000000000..726cdd41731 --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/euptriptest.test @@ -0,0 +1,131 @@ +#! /bin/sh + +# Copyright (C) 2010 Hironori Kitagawa +# Copyright (C) 2011-2014 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +testdir=$abs_srcdir/triptrap +etestdir=$abs_srcdir/etexdir/etrip +eptestdir=$abs_srcdir/eptexdir/eptrip +euptestdir=$abs_srcdir/euptexdir/euptrip + +TEXMFCNF=$euptestdir; export TEXMFCNF + +rm -rf euptripdir +mkdir euptripdir +cd euptripdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running e-TRIP test for e-upTeX." >&2 +echo ">>> See $euptestdir/euptrip.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 e-upTeX in compatibility mode ***." + +../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 +../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 + +# May as well test non-ini second time through. +rm -f trip.log +../euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot +sed "$P_SED1;$P_SED2" trip.log > cuptrip.log +diff $testdir/trip.fot cuptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$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 + +# May as well test non-ini second time through. +rm -f trip.log +../euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot +sed "$P_SED1;$P_SED2" trip.log > xuptrip.log +diff $testdir/trip.fot xuptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$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 ***." + +../pltotf $etestdir/etrip.pl etrip.tfm || exit 1 + +../tftopl ./etrip.tfm etrip.pl || exit 1 + +diff $etestdir/etrip.pl etrip.pl || is_OK=false + +# get same filename in log +$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 + +# May as well test non-ini second time through. +../euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot +sed "$P_SED1;$P_SED2" etrip.log > euptrip.log +diff $etestdir/etrip.fot euptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $eptestdir/eptrip.log euptrip.log + +eval ../dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 +$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + -- cgit v1.2.3