summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/ptexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-15 13:34:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-15 13:34:06 +0000
commit948a54cc84456123b69a9b614326df2284d1031c (patch)
treed8b0262ad65fbdd133ae4e3a0f69252e0a57234a /Build/source/texk/web2c/ptexdir
parent1f09e19d2d4aa39249771dc1537e2752fe75a420 (diff)
texk/web2c: Enable parallel-tests
git-svn-id: svn://tug.org/texlive/trunk@28841 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/ptexdir')
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am11
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/pbibtex-mem.test14
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/ptrip.test25
4 files changed, 28 insertions, 27 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 1befd59bdd8..c90255555b5 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am, pbibtex-mem.test, ptrip.test:
+ Enable parallel-tests.
+
2013-01-04 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* ptex-base.ch: \xkanjiskip around math_node etc.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 7976cdc7918..68062ae007f 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -1,6 +1,6 @@
## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
##
-## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -206,7 +206,7 @@ DISTCLEANFILES += tests/nissya_bib.*
DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
## ptexdir/pbibtex-mem.test
EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst
-DISTCLEANFILES += tests/memtest.bib tests/memtest?.*
+DISTCLEANFILES += ptests/memtest.bib ptests/memtest?.*
## ptexdir/pdvitype.test
DISTCLEANFILES += tests/xstory.dvityp tests/xpagenum.typ
## ptexdir/ppltotf.test
@@ -226,10 +226,7 @@ ptrip.diffs: ptex$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: ptrip-clean
ptrip-clean:
- rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log
- rm -f ptrip.fot ptrip.log trip.log trip.dvi trip.typ
- rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.typ
- rm -f tripos.tex 8terminal.tex
- rm -rf tfm
+ rm -rf ptripdir
+
DISTCLEANFILES += ptrip.diffs
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex-mem.test b/Build/source/texk/web2c/ptexdir/pbibtex-mem.test
index 69773b5f751..9767af8a741 100755
--- a/Build/source/texk/web2c/ptexdir/pbibtex-mem.test
+++ b/Build/source/texk/web2c/ptexdir/pbibtex-mem.test
@@ -1,11 +1,11 @@
#! /bin/sh
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
# Using test data from Philipp Lehman <lehman@gmx.net>
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
# Create bib data
mk_bib () {
@@ -47,13 +47,13 @@ EOF
for t in 1 2 3; do
- mk_aux memdata$t >tests/memtest$t.aux
+ mk_aux memdata$t >ptests/memtest$t.aux
env=
case $t in
- 1) mk_bib 0 >tests/memtest.bib;;
- 2) mk_bib 1 >>tests/memtest.bib;;
+ 1) mk_bib 0 >ptests/memtest.bib;;
+ 2) mk_bib 1 >>ptests/memtest.bib;;
3) env='ent_str_size=2000 glob_str_size=2000';;
esac
@@ -62,8 +62,8 @@ for t in 1 2 3; do
eval $env \
TEXMFCNF=$srcdir/../kpathsea \
BSTINPUTS=$srcdir/tests \
- BIBINPUTS=./tests \
- ./pbibtex tests/memtest$t || exit 1
+ BIBINPUTS=./ptests \
+ ./pbibtex ptests/memtest$t || exit 1
done
diff --git a/Build/source/texk/web2c/ptexdir/ptrip.test b/Build/source/texk/web2c/ptexdir/ptrip.test
index 1ae53675851..4b00cd35a55 100755
--- a/Build/source/texk/web2c/ptexdir/ptrip.test
+++ b/Build/source/texk/web2c/ptexdir/ptrip.test
@@ -1,23 +1,22 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-testdir=$srcdir/triptrap
-ptestdir=$srcdir/ptexdir/ptrip
+testdir=$abs_srcdir/triptrap
+ptestdir=$abs_srcdir/ptexdir/ptrip
TEXMFCNF=$ptestdir; export TEXMFCNF
+rm -rf ptripdir
+mkdir ptripdir
+cd ptripdir
+
dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'"
echo ">>> Running TRIP test for pTeX." >&2
echo ">>> See $ptestdir/ptrip.diffs for example of acceptable diffs." >&2
-rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \
- ptripin.fot ptripin.log ptrip.fot ptrip.log ptrip.typ \
- tripos.tex 8terminal.tex
-rm -rf tfm
-
# pTeX 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 pTeX ***."
-./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
-./ptex --progname=pinitex --ini <$testdir/trip1.in >ptripin.fot
+../ptex --progname=pinitex --ini <$testdir/trip1.in >ptripin.fot
sed "$P_SED1" trip.log > ptripin.log || exit 1
diff $testdir/tripin.log ptripin.log
# May as well test non-ini second time through.
rm -f trip.log
-./ptex --progname=ptex <$testdir/trip2.in >ptrip.fot
+../ptex --progname=ptex <$testdir/trip2.in >ptrip.fot
sed "$P_SED1;$P_SED2" trip.log > ptrip.log
diff $testdir/trip.fot ptrip.fot
@@ -52,7 +51,7 @@ diff $testdir/trip.fot ptrip.fot
# might actually be legitimate numerical differences.
$DIFF $DIFFFLAGS $testdir/trip.log ptrip.log
-eval ./dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1
+eval ../dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1
$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ
$is_OK || {