From 948a54cc84456123b69a9b614326df2284d1031c Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 15 Jan 2013 13:34:06 +0000 Subject: texk/web2c: Enable parallel-tests git-svn-id: svn://tug.org/texlive/trunk@28841 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/etexdir/ChangeLog | 4 +++ Build/source/texk/web2c/etexdir/am/etex.am | 11 ++------ Build/source/texk/web2c/etexdir/etrip.test | 44 ++++++++++++++---------------- 3 files changed, 26 insertions(+), 33 deletions(-) (limited to 'Build/source/texk/web2c/etexdir') diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 45fc80dbf57..c6209ea517e 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-01-15 Peter Breitenlohner + + * am/etex.am, etrip.test: Enable parallel-tests. + 2012-12-16 Peter Breitenlohner * am/etex.am (etex_version.h): Enable silent rules. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 99ede798a36..379740f0c5e 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -1,6 +1,6 @@ ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX. ## -## Copyright (C) 2009-2012 Peter Breitenlohner +## Copyright (C) 2009-2013 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## e-TeX @@ -94,14 +94,7 @@ etrip.diffs: etex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: etrip-clean etrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log - rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ - rm -f xtripin.fot xtripin.log - rm -f xtrip.fot xtrip.log xtrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log - rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf etripdir ## Test data ## diff --git a/Build/source/texk/web2c/etexdir/etrip.test b/Build/source/texk/web2c/etexdir/etrip.test index da2fe891c32..4266de6ab46 100755 --- a/Build/source/texk/web2c/etexdir/etrip.test +++ b/Build/source/texk/web2c/etexdir/etrip.test @@ -1,47 +1,43 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner +# Copyright (C) 2009-2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap -etestdir=$srcdir/etexdir/etrip +testdir=$abs_srcdir/triptrap +etestdir=$abs_srcdir/etexdir/etrip TEXMFCNF=$etestdir; export TEXMFCNF +rm -rf etripdir +mkdir etripdir +cd etripdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running e-TRIP test for e-TeX." >&2 echo ">>> See $etestdir/etrip.diffs for example of acceptable diffs." >&2 -rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ - ctripin.fot ctripin.log ctrip.fot ctrip.log ctrip.typ \ - xtripin.fot xtripin.log xtrip.fot xtrip.log xtrip.typ \ - etrip.tfm etrip.pl etrip.tex etrip.fmt etrip.dvi \ - etripin.fot etripin.log etrip.fot etrip.log etrip.out etrip.typ \ - tripos.tex 8terminal.tex -rm -rf tfm - is_OK=: set -x echo "*** TRIP test for e-TeX in compatibility mode ***." -./pltotf $testdir/trip.pl trip.tfm || exit 1 +../pltotf $testdir/trip.pl trip.tfm || exit 1 -./tftopl ./trip.tfm trip.pl || 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 . -./etex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot +../etex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot mv trip.log ctripin.log || exit 1 diff $testdir/tripin.log ctripin.log # May as well test non-ini second time through. -./etex --progname=etex <$testdir/trip2.in >ctrip.fot +../etex --progname=etex <$testdir/trip2.in >ctrip.fot mv trip.log ctrip.log diff $testdir/trip.fot ctrip.fot @@ -49,19 +45,19 @@ diff $testdir/trip.fot ctrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log ctrip.log -eval ./dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ # ============================== echo "*** TRIP test for e-TeX in extended mode ***." -./etex --progname=einitex --ini <$etestdir/etrip1.in >xtripin.fot +../etex --progname=einitex --ini <$etestdir/etrip1.in >xtripin.fot mv trip.log xtripin.log || exit 1 diff ctripin.log xtripin.log # May as well test non-ini second time through. -./etex --progname=etex <$etestdir/trip2.in >xtrip.fot +../etex --progname=etex <$etestdir/trip2.in >xtrip.fot mv trip.log xtrip.log diff ctrip.fot xtrip.fot @@ -69,35 +65,35 @@ diff ctrip.fot xtrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS ctrip.log xtrip.log -eval ./dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 $DIFF $DIFFFLAGS ctrip.typ xtrip.typ # ============================== echo "*** e-TeX specific part of e-TRIP test ***." -./pltotf $etestdir/etrip.pl etrip.tfm || exit 1 +../pltotf $etestdir/etrip.pl etrip.tfm || exit 1 -./tftopl ./etrip.tfm etrip.pl || 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 $etestdir/etrip.tex . -./etex --progname=einitex --ini <$etestdir/etrip2.in >etripin.fot +../etex --progname=einitex --ini <$etestdir/etrip2.in >etripin.fot mv etrip.log etripin.log || exit 1 diff $etestdir/etripin.log etripin.log # May as well test non-ini second time through. -./etex --progname=etex <$etestdir/etrip3.in >etrip.fot +../etex --progname=etex <$etestdir/etrip3.in >etrip.fot diff $etestdir/etrip.fot etrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $etestdir/etrip.log etrip.log -eval ./dvitype $dvitype_args etrip.dvi >etrip.typ || exit 1 +eval ../dvitype $dvitype_args etrip.dvi >etrip.typ || exit 1 $DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ $is_OK || { -- cgit v1.2.3