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/mplibdir/ChangeLog | 14 +++++++-- Build/source/texk/web2c/mplibdir/am/mplib.am | 7 +++-- Build/source/texk/web2c/mplibdir/mptraptest | 39 ------------------------ Build/source/texk/web2c/mplibdir/mptraptest.test | 39 ++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 45 deletions(-) delete mode 100755 Build/source/texk/web2c/mplibdir/mptraptest create mode 100755 Build/source/texk/web2c/mplibdir/mptraptest.test (limited to 'Build/source/texk/web2c/mplibdir') diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 08914bafd24..0c4707eefc6 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,21 +1,29 @@ +2015-07-10 Peter Breitenlohner + + * mptraptest (removed): Renamed ... + * mptraptest.test (new): ... into this. + * am/mplib.am: Better dependencies for 'make check'. + 2015-03-21 Luigi Scarso - make_text for mplib only. + make_text for mplib only. 2015-03-19 Luigi Scarso + Fixed normal rand. generator for double/decimal/binary systems. 2015-01-20 Luigi Scarso + Added cur_sym_mod() == mp_normal_sym to the cur_sym==0 condition mp_cur_tok - 2015-01-19 Luigi Scarso - fixed a bug in mp_recycle_value with NULL node + fixed a bug in mp_recycle_value with NULL node 2015-01-15 Luigi Scarso + mpmathdecimal.w: better management for static data in mpmathdecimal.w (thanks to Philipp Gesang ) diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 041bf67d012..673d3a9921a 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -63,13 +63,14 @@ DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-tangle ## MetaPost Tests ## -mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest +mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test +mplibdir/dvitomp.log: mpost$(EXEEXT) +mplibdir/mptraptest.log: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) EXTRA_DIST += $(mp_tests) if MP TESTS += $(mp_tests) -check_PROGRAMS += pltotf tftopl TRIPTRAP += mptrap.diffs TRIPTRAP_CLEAN += mptrap-clean endif MP @@ -78,7 +79,7 @@ DISTCLEANFILES += mptrap.diffs ## mplibdir/dvitomp.test DISTCLEANFILES += ptmr.mpx tests/xptmr.mpx tests/xstory.mpx ## mplibdir/mptraptest -mptrap.diffs: mpost$(EXEEXT) +mptrap.diffs: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) $(triptrap_diffs) $@ .PHONY: mptrap-clean mptrap-clean: diff --git a/Build/source/texk/web2c/mplibdir/mptraptest b/Build/source/texk/web2c/mplibdir/mptraptest deleted file mode 100755 index 86203400491..00000000000 --- a/Build/source/texk/web2c/mplibdir/mptraptest +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh - -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 - -set -x - -../pltotf $testdir/trapf.pl trapf.tfm - -# get same filename in log -$LN_S $testdir/mtrap.mp . || exit 1 - -../mpost --ini mtrap -diff $testdir/mtrap.log mtrap.log -diff $testdir/mtrap.0 mtrap.0 -diff $testdir/mtrap.1 mtrap.1 -diff $testdir/writeo writeo -diff $testdir/writeo.2 writeo.2 - -$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 -mv trap.log mptrapin.log || exit 1 -diff $testdir/mptrapin.log mptrapin.log - -exit 0 - diff --git a/Build/source/texk/web2c/mplibdir/mptraptest.test b/Build/source/texk/web2c/mplibdir/mptraptest.test new file mode 100755 index 00000000000..86203400491 --- /dev/null +++ b/Build/source/texk/web2c/mplibdir/mptraptest.test @@ -0,0 +1,39 @@ +#! /bin/sh + +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 + +set -x + +../pltotf $testdir/trapf.pl trapf.tfm + +# get same filename in log +$LN_S $testdir/mtrap.mp . || exit 1 + +../mpost --ini mtrap +diff $testdir/mtrap.log mtrap.log +diff $testdir/mtrap.0 mtrap.0 +diff $testdir/mtrap.1 mtrap.1 +diff $testdir/writeo writeo +diff $testdir/writeo.2 writeo.2 + +$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 +mv trap.log mptrapin.log || exit 1 +diff $testdir/mptrapin.log mptrapin.log + +exit 0 + -- cgit v1.2.3