summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/mplibdir
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/mplibdir
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/mplibdir')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am12
-rwxr-xr-xBuild/source/texk/web2c/mplibdir/mptrap.test22
3 files changed, 14 insertions, 24 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 7c439b7c9c2..8c68cb60418 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mplib.am, mptrap.test: Enable parallel-tests.
+
2012-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/mplib.am: Enable silent rules.
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index 85f41ec6ac0..e8ae8808c17 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -1,6 +1,6 @@
## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost.
##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## MetaPost
@@ -82,13 +82,5 @@ mptrap.diffs: mpost$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: mptrap-clean
mptrap-clean:
- rm -f mtrap.mp mtrap.mem trapf.tfm
- rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2
- rm -f trap.mp trap.mpx mptrapin.fot mptrapin.log
- rm -f mptrap.fot mptrap.log mptrap.tfm
- rm -f trap.ps trap.mem trap.0 trap.5 trap.6 trap.95 trap.96 trap.97
- rm -f trap.98 trap.99 trap.100 trap.101 trap.102 trap.103 trap.104
- rm -f trap.105 trap.106 trap.107 trap.108 trap.109 trap.148
- rm -f trap.149 trap.150 trap.151 trap.197 trap.200
- rm -f mptrap.pl
+ rm -rf mptrapdir
diff --git a/Build/source/texk/web2c/mplibdir/mptrap.test b/Build/source/texk/web2c/mplibdir/mptrap.test
index e1eb9b00f92..86203400491 100755
--- a/Build/source/texk/web2c/mplibdir/mptrap.test
+++ b/Build/source/texk/web2c/mplibdir/mptrap.test
@@ -1,32 +1,26 @@
#! /bin/sh
-testdir=$srcdir/triptrap
+testdir=$abs_srcdir/triptrap
TEXMFCNF=$testdir; export TEXMFCNF
+rm -rf mptrapdir
+mkdir mptrapdir
+cd mptrapdir
+
dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'"
echo ">>> Running MPTRAP test for MetaPost." >&2
echo ">>> See $testdir/mptrap.diffs for example of acceptable diffs." >&2
-rm -f mtrap.mp mtrap.mem trapf.tfm
-rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2
-rm -f trap.mp trap.mpx mptrapin.fot mptrapin.log
-rm -f mptrap.fot mptrap.log mptrap.tfm
-rm -f trap.ps trap.mem trap.0 trap.5 trap.6 trap.95 trap.96 trap.97
-rm -f trap.98 trap.99 trap.100 trap.101 trap.102 trap.103 trap.104
-rm -f trap.105 trap.106 trap.107 trap.108 trap.109 trap.148
-rm -f trap.149 trap.150 trap.151 trap.197 trap.200
-rm -f mptrap.pl
-
set -x
-./pltotf $testdir/trapf.pl trapf.tfm
+../pltotf $testdir/trapf.pl trapf.tfm
# get same filename in log
$LN_S $testdir/mtrap.mp . || exit 1
-./mpost --ini mtrap
+../mpost --ini mtrap
diff $testdir/mtrap.log mtrap.log
diff $testdir/mtrap.0 mtrap.0
diff $testdir/mtrap.1 mtrap.1
@@ -37,7 +31,7 @@ $LN_S $testdir/trap.mp . || exit 1
$LN_S $testdir/trap.mpx . || exit 1
## Why is --jobname required? And why --ini?
-./mpost --ini --jobname=trap <$testdir/mptrap1.in >mptrapin.fot
+../mpost --ini --jobname=trap <$testdir/mptrap1.in >mptrapin.fot
mv trap.log mptrapin.log || exit 1
diff $testdir/mptrapin.log mptrapin.log