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/uptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/uptexdir/am/uptex.am | 9 +++------ Build/source/texk/web2c/uptexdir/uptrip.test | 25 ++++++++++++------------- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'Build/source/texk/web2c/uptexdir') diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 95fc9af66ca..07d7811b5fa 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-01-15 Peter Breitenlohner + + * am/uptex.am, uptrip.test: Enable parallel-tests. + 2013-01-04 Hironori Kitagawa * uptex-m.ch: \xkanjiskip around math_node etc. diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 63af2121a76..ab265786dc3 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -1,6 +1,6 @@ ## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX. ## -## Copyright (C) 2011, 2012 Peter Breitenlohner +## Copyright (C) 2011-2013 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) @@ -194,10 +194,7 @@ uptrip.diffs: uptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: uptrip-clean uptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt uptripin.fot uptripin.log - rm -f uptrip.fot uptrip.log trip.log trip.dvi trip.typ - rm -f uptrip.fot uptrip.log uptrip.dvi uptrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf uptripdir + DISTCLEANFILES += uptrip.diffs diff --git a/Build/source/texk/web2c/uptexdir/uptrip.test b/Build/source/texk/web2c/uptexdir/uptrip.test index e9976a5b128..e7b384cf825 100755 --- a/Build/source/texk/web2c/uptexdir/uptrip.test +++ b/Build/source/texk/web2c/uptexdir/uptrip.test @@ -1,23 +1,22 @@ #! /bin/sh -# Copyright (C) 2011 Peter Breitenlohner +# Copyright (C) 2011-2013 Peter Breitenlohner # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap -uptestdir=$srcdir/uptexdir/uptrip +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 -rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ - uptripin.fot uptripin.log uptrip.fot uptrip.log uptrip.typ \ - tripos.tex 8terminal.tex -rm -rf tfm - # upTeX outputs direction of boxes. P_SED1='s/, yoko direction//;s/yoko direction, //' P_SED2='s/yoko(math) direction, //' @@ -28,9 +27,9 @@ set -x echo "*** TRIP test for upTeX ***." -./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 @@ -38,13 +37,13 @@ diff $testdir/trip.pl trip.pl || is_OK=false $LN_S $testdir/trip.tex . rm -f trip.log -./uptex --progname=upinitex --ini <$testdir/trip1.in >uptripin.fot +../uptex --progname=upinitex --ini <$testdir/trip1.in >uptripin.fot 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 +../uptex --progname=uptex <$testdir/trip2.in >uptrip.fot sed "$P_SED1;$P_SED2" trip.log > uptrip.log diff $testdir/trip.fot uptrip.fot @@ -52,7 +51,7 @@ diff $testdir/trip.fot uptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log uptrip.log -eval ./dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ $is_OK || { -- cgit v1.2.3