From 46bf89c67558df91d6a66b1fbb084a77304a802f Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 17 Jan 2014 08:29:40 +0000 Subject: TeX & Co: Rename trip.test => triptest, trap.test => mftraptest, etc git-svn-id: svn://tug.org/texlive/trunk@32698 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 8 ++ Build/source/texk/web2c/Makefile.in | 72 ++++++++++++++-- Build/source/texk/web2c/am/texmf.am | 10 +-- Build/source/texk/web2c/eptexdir/ChangeLog | 6 ++ Build/source/texk/web2c/eptexdir/am/eptex.am | 6 +- Build/source/texk/web2c/eptexdir/eptrip.test | 114 ------------------------ Build/source/texk/web2c/eptexdir/eptriptest | 114 ++++++++++++++++++++++++ Build/source/texk/web2c/etexdir/ChangeLog | 6 ++ Build/source/texk/web2c/etexdir/am/etex.am | 6 +- Build/source/texk/web2c/etexdir/etrip.test | 103 ---------------------- Build/source/texk/web2c/etexdir/etriptest | 103 ++++++++++++++++++++++ Build/source/texk/web2c/euptexdir/ChangeLog | 6 ++ Build/source/texk/web2c/euptexdir/am/euptex.am | 6 +- Build/source/texk/web2c/euptexdir/euptrip.test | 115 ------------------------- Build/source/texk/web2c/euptexdir/euptriptest | 115 +++++++++++++++++++++++++ Build/source/texk/web2c/mftraptest | 41 +++++++++ Build/source/texk/web2c/mplibdir/ChangeLog | 6 ++ Build/source/texk/web2c/mplibdir/am/mplib.am | 8 +- Build/source/texk/web2c/mplibdir/mptrap.test | 39 --------- Build/source/texk/web2c/mplibdir/mptraptest | 39 +++++++++ Build/source/texk/web2c/ptexdir/ChangeLog | 6 ++ Build/source/texk/web2c/ptexdir/am/ptex.am | 6 +- Build/source/texk/web2c/ptexdir/ptrip.test | 61 ------------- Build/source/texk/web2c/ptexdir/ptriptest | 61 +++++++++++++ Build/source/texk/web2c/trap.test | 41 --------- Build/source/texk/web2c/trip.test | 51 ----------- Build/source/texk/web2c/triptest | 51 +++++++++++ Build/source/texk/web2c/triptrap-sh | 26 +++--- Build/source/texk/web2c/uptexdir/ChangeLog | 6 ++ Build/source/texk/web2c/uptexdir/am/uptex.am | 6 +- Build/source/texk/web2c/uptexdir/uptrip.test | 61 ------------- Build/source/texk/web2c/uptexdir/uptriptest | 61 +++++++++++++ 32 files changed, 730 insertions(+), 630 deletions(-) delete mode 100755 Build/source/texk/web2c/eptexdir/eptrip.test create mode 100755 Build/source/texk/web2c/eptexdir/eptriptest delete mode 100755 Build/source/texk/web2c/etexdir/etrip.test create mode 100755 Build/source/texk/web2c/etexdir/etriptest delete mode 100755 Build/source/texk/web2c/euptexdir/euptrip.test create mode 100755 Build/source/texk/web2c/euptexdir/euptriptest create mode 100755 Build/source/texk/web2c/mftraptest delete mode 100755 Build/source/texk/web2c/mplibdir/mptrap.test create mode 100755 Build/source/texk/web2c/mplibdir/mptraptest delete mode 100755 Build/source/texk/web2c/ptexdir/ptrip.test create mode 100755 Build/source/texk/web2c/ptexdir/ptriptest delete mode 100755 Build/source/texk/web2c/trap.test delete mode 100755 Build/source/texk/web2c/trip.test create mode 100755 Build/source/texk/web2c/triptest delete mode 100755 Build/source/texk/web2c/uptexdir/uptrip.test create mode 100755 Build/source/texk/web2c/uptexdir/uptriptest (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index ed7ba239aa8..678ccebfba9 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,11 @@ +2014-01-17 Peter Breitenlohner + + * trap.test (removed): Renamed ... + * mftraptest (new): ... into this. + * trp.test (removed): Renamed ... + * triptest (new): ... into this. + * am/texmf.am, triptrap-sh: Adapted. + 2014-01-14 Peter Breitenlohner * mf.ch, tex.ch: Write dump_name to the terminal. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 89702058494..686c18bcc58 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -2183,7 +2183,7 @@ tex_ch_srcs = \ # TeX tests # -tex_tests = trip.test tests/write18-quote-test.pl +tex_tests = triptest tests/write18-quote-test.pl inimf_CPPFLAGS = -DEXEPROG=\"mf.exe\" nodist_inimf_SOURCES = callexe.c inimf_LDADD = @@ -2215,7 +2215,7 @@ mf_ch_src = \ # Metafont tests # -mf_tests = trap.test +mf_tests = mftraptest mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) @@ -2230,7 +2230,7 @@ mp_ctangle_sh = CWEBINPUTS=$(srcdir)/mplibdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle nodist_mpost_SOURCES = mpost.c $(mpxout_c_h) mpxout_c_h = mpxout.c mpxout.h mpost_web = mplibdir/mpost.w mplibdir/mpxout.w -mp_tests = mplibdir/dvitomp.test mplibdir/mptrap.test +mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest libmplib_a_CPPFLAGS = $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdouble_c_h) $(psout_c_h) $(svgout_c_h) $(pngout_c_h) $(mpstrings_c_h) @@ -2273,7 +2273,7 @@ etex_ch_srcs = \ # e-TeX Tests # -etex_tests = etexdir/wprob.test etexdir/etrip.test +etex_tests = etexdir/wprob.test etexdir/etriptest ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) @@ -2282,7 +2282,7 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl # pTeX Tests # -ptex_tests = ptexdir/ptrip.test +ptex_tests = ptexdir/ptriptest pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \ ptexdir/ppltotf.test ptexdir/ptftopl.test \ ptexdir/pbibtex-openout-test.pl \ @@ -2337,7 +2337,7 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies) # e-pTeX Tests # -eptex_tests = eptexdir/eptrip.test +eptex_tests = eptexdir/eptriptest eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_97) # With --enable-ipc, e-pTeX may need to link with -lsocket. @@ -2379,7 +2379,7 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) upweb_programs = upbibtex updvitype uppltotf uptftopl # upTeX Tests -uptex_tests = uptexdir/uptrip.test +uptex_tests = uptexdir/uptriptest upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \ uptexdir/uppltotf.test uptexdir/uptftopl.test \ uptexdir/yokotate.test @@ -2433,7 +2433,7 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies) # e-upTeX Tests # -euptex_tests = euptexdir/euptrip.test +euptex_tests = euptexdir/euptriptest euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_101) # With --enable-ipc, e-upTeX may need to link with -lsocket. @@ -9840,6 +9840,13 @@ tests/bibtex-longline-test.pl.log: tests/bibtex-longline-test.pl --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +triptest.log: triptest + @p='triptest'; \ + b='triptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) tests/write18-quote-test.pl.log: tests/write18-quote-test.pl @p='tests/write18-quote-test.pl'; \ b='tests/write18-quote-test.pl'; \ @@ -9847,6 +9854,34 @@ tests/write18-quote-test.pl.log: tests/write18-quote-test.pl --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +mftraptest.log: mftraptest + @p='mftraptest'; \ + b='mftraptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +mplibdir/mptraptest.log: mplibdir/mptraptest + @p='mplibdir/mptraptest'; \ + b='mplibdir/mptraptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +etexdir/etriptest.log: etexdir/etriptest + @p='etexdir/etriptest'; \ + b='etexdir/etriptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +ptexdir/ptriptest.log: ptexdir/ptriptest + @p='ptexdir/ptriptest'; \ + b='ptexdir/ptriptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) ptexdir/pbibtex-openout-test.pl.log: ptexdir/pbibtex-openout-test.pl @p='ptexdir/pbibtex-openout-test.pl'; \ b='ptexdir/pbibtex-openout-test.pl'; \ @@ -9861,6 +9896,27 @@ ptexdir/pbibtex-longline-test.pl.log: ptexdir/pbibtex-longline-test.pl --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +eptexdir/eptriptest.log: eptexdir/eptriptest + @p='eptexdir/eptriptest'; \ + b='eptexdir/eptriptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +uptexdir/uptriptest.log: uptexdir/uptriptest + @p='uptexdir/uptriptest'; \ + b='uptexdir/uptriptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +euptexdir/euptriptest.log: euptexdir/euptriptest + @p='euptexdir/euptriptest'; \ + b='euptexdir/euptriptest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 77c4673443c..60341d09b77 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -1,6 +1,6 @@ ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF. ## -## Copyright (C) 2009-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## Common for MF and TeX @@ -73,7 +73,7 @@ DISTCLEANFILES += $(nodist_tex_SOURCES) tex-final.ch tex-web2c \ # TeX tests # -tex_tests = trip.test tests/write18-quote-test.pl +tex_tests = triptest tests/write18-quote-test.pl EXTRA_DIST += $(tex_tests) EXTRA_DIST += tests/write18-quote.tex if TEX @@ -87,7 +87,7 @@ DISTCLEANFILES += trip.diffs ## tests/write18-quote-test.pl DISTCLEANFILES += write18-quote.log -## trip.test +## triptest trip.diffs: tex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: trip-clean @@ -181,7 +181,7 @@ DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c \ # Metafont tests # -mf_tests = trap.test +mf_tests = mftraptest EXTRA_DIST += $(mf_tests) if MF TESTS += $(mf_tests) @@ -190,7 +190,7 @@ TRIPTRAP += mftrap.diffs TRIPTRAP_CLEAN += trap-clean endif MF -## trap.test +## mftraptest mftrap.diffs: mf$(EXEEXT) $(triptrap_diffs) $@ .PHONY: trap-clean diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 60fd4c07286..282508678f1 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Peter Breitenlohner + + * eptrip.test (removed): Renamed ... + * eptriptest (new): ... into this. + * am/eptex.am: Adapted. + 2013-11-21 Peter Breitenlohner * eptrip/eptrip.diffs, eptrip/etrip.log: Update for etrip.tex diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index b8a8d027d18..22cf35bacb0 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -1,6 +1,6 @@ ## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX. ## -## Copyright (C) 2011-2013 Peter Breitenlohner +## Copyright (C) 2011-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## e-pTeX @@ -12,7 +12,7 @@ EXTRA_PROGRAMS += eptex # e-pTeX Tests # -eptex_tests = eptexdir/eptrip.test +eptex_tests = eptexdir/eptriptest EXTRA_DIST += $(eptex_tests) @@ -94,7 +94,7 @@ endif EPTEX ## Test data and results ## -## eptexdir/eptrip.test +## eptexdir/eptriptest EXTRA_DIST += \ eptexdir/eptrip/eptrip.diffs \ eptexdir/eptrip/etrip.log \ diff --git a/Build/source/texk/web2c/eptexdir/eptrip.test b/Build/source/texk/web2c/eptexdir/eptrip.test deleted file mode 100755 index ed651194b3f..00000000000 --- a/Build/source/texk/web2c/eptexdir/eptrip.test +++ /dev/null @@ -1,114 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 Hironori Kitagawa -# Copyright (C) 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -testdir=$abs_srcdir/triptrap -etestdir=$abs_srcdir/etexdir/etrip -eptestdir=$abs_srcdir/eptexdir/eptrip - -TEXMFCNF=$eptestdir; export TEXMFCNF - -rm -rf eptripdir -mkdir eptripdir -cd eptripdir - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" - -echo ">>> Running e-TRIP test for e-pTeX." >&2 -echo ">>> See $eptestdir/eptrip.diffs for example of acceptable diffs." >&2 - -# pTeX outputs direction of boxes. -P_SED1='s/, yoko direction//;s/yoko direction, //' -P_SED2='s/yoko(math) direction, //' - -is_OK=: - -set -x - -echo "*** TRIP test for e-pTeX in compatibility mode ***." - -../pltotf $testdir/trip.pl trip.tfm || 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 . - -rm -f trip.log -../eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot -sed "$P_SED1" trip.log > cptripin.log || exit 1 -diff $testdir/tripin.log cptripin.log - -# May as well test non-ini second time through. -rm -f trip.log -../eptex --progname=eptex <$testdir/trip2.in >cptrip.fot -sed "$P_SED1;$P_SED2" trip.log > cptrip.log -diff $testdir/trip.fot cptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log - -eval ../dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ - -# ================================= - -echo "*** TRIP test for e-pTeX in extended mode ***." - -rm -f trip.log -../eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot -sed "$P_SED1" trip.log > xptripin.log || exit 1 -diff $testdir/tripin.log xptripin.log - -# May as well test non-ini second time through. -rm -f trip.log -../eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot -sed "$P_SED1;$P_SED2" trip.log > xptrip.log -diff $testdir/trip.fot xptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log - -eval ../dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ - -# ================================= - -echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***." - -../pltotf $etestdir/etrip.pl etrip.tfm || 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 $eptestdir/etrip.tex . - -../eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot -sed "$P_SED1" etrip.log > eptripin.log || exit 1 -diff $etestdir/etripin.log eptripin.log - -# May as well test non-ini second time through. -../eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot -sed "$P_SED1;$P_SED2" etrip.log > eptrip.log -diff $etestdir/etrip.fot eptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/etrip.log eptrip.log - -eval ../dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 -$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/eptexdir/eptriptest b/Build/source/texk/web2c/eptexdir/eptriptest new file mode 100755 index 00000000000..ed651194b3f --- /dev/null +++ b/Build/source/texk/web2c/eptexdir/eptriptest @@ -0,0 +1,114 @@ +#! /bin/sh + +# Copyright (C) 2010 Hironori Kitagawa +# Copyright (C) 2011-2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +testdir=$abs_srcdir/triptrap +etestdir=$abs_srcdir/etexdir/etrip +eptestdir=$abs_srcdir/eptexdir/eptrip + +TEXMFCNF=$eptestdir; export TEXMFCNF + +rm -rf eptripdir +mkdir eptripdir +cd eptripdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running e-TRIP test for e-pTeX." >&2 +echo ">>> See $eptestdir/eptrip.diffs for example of acceptable diffs." >&2 + +# pTeX outputs direction of boxes. +P_SED1='s/, yoko direction//;s/yoko direction, //' +P_SED2='s/yoko(math) direction, //' + +is_OK=: + +set -x + +echo "*** TRIP test for e-pTeX in compatibility mode ***." + +../pltotf $testdir/trip.pl trip.tfm || 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 . + +rm -f trip.log +../eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot +sed "$P_SED1" trip.log > cptripin.log || exit 1 +diff $testdir/tripin.log cptripin.log + +# May as well test non-ini second time through. +rm -f trip.log +../eptex --progname=eptex <$testdir/trip2.in >cptrip.fot +sed "$P_SED1;$P_SED2" trip.log > cptrip.log +diff $testdir/trip.fot cptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log + +eval ../dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ + +# ================================= + +echo "*** TRIP test for e-pTeX in extended mode ***." + +rm -f trip.log +../eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot +sed "$P_SED1" trip.log > xptripin.log || exit 1 +diff $testdir/tripin.log xptripin.log + +# May as well test non-ini second time through. +rm -f trip.log +../eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot +sed "$P_SED1;$P_SED2" trip.log > xptrip.log +diff $testdir/trip.fot xptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log + +eval ../dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ + +# ================================= + +echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***." + +../pltotf $etestdir/etrip.pl etrip.tfm || 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 $eptestdir/etrip.tex . + +../eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot +sed "$P_SED1" etrip.log > eptripin.log || exit 1 +diff $etestdir/etripin.log eptripin.log + +# May as well test non-ini second time through. +../eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot +sed "$P_SED1;$P_SED2" etrip.log > eptrip.log +diff $etestdir/etrip.fot eptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $eptestdir/etrip.log eptrip.log + +eval ../dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 +$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 6e1a16729ab..3aeb8f1dbf8 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Peter Breitenlohner + + * etrip.test (removed): Renamed ... + * etriptest (new): ... into this. + * am/etex.am: Adapted. + 2013-11-21 Peter Breitenlohner * etex.ch: Enable hyphenation of text between \beginL and \endL or diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index dcbe1642d02..05d86297c22 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-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## e-TeX @@ -73,7 +73,7 @@ EXTRA_DIST += \ # e-TeX Tests # -etex_tests = etexdir/wprob.test etexdir/etrip.test +etex_tests = etexdir/wprob.test etexdir/etriptest EXTRA_DIST += $(etex_tests) @@ -88,7 +88,7 @@ DISTCLEANFILES += etrip.diffs ## wprob.test EXTRA_DIST += tests/wprob.tex DISTCLEANFILES += ewprob.log ewprob.tex -## etrip.test +## etriptest etrip.diffs: etex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: etrip-clean diff --git a/Build/source/texk/web2c/etexdir/etrip.test b/Build/source/texk/web2c/etexdir/etrip.test deleted file mode 100755 index 4266de6ab46..00000000000 --- a/Build/source/texk/web2c/etexdir/etrip.test +++ /dev/null @@ -1,103 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2009-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -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 - -is_OK=: - -set -x - -echo "*** TRIP test for e-TeX in compatibility mode ***." - -../pltotf $testdir/trip.pl trip.tfm || 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 -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 -mv trip.log ctrip.log -diff $testdir/trip.fot ctrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log ctrip.log - -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 -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 -mv trip.log xtrip.log -diff ctrip.fot xtrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS ctrip.log xtrip.log - -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 - -../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 -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 -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 -$DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/etexdir/etriptest b/Build/source/texk/web2c/etexdir/etriptest new file mode 100755 index 00000000000..4266de6ab46 --- /dev/null +++ b/Build/source/texk/web2c/etexdir/etriptest @@ -0,0 +1,103 @@ +#! /bin/sh + +# Copyright (C) 2009-2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +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 + +is_OK=: + +set -x + +echo "*** TRIP test for e-TeX in compatibility mode ***." + +../pltotf $testdir/trip.pl trip.tfm || 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 +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 +mv trip.log ctrip.log +diff $testdir/trip.fot ctrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log ctrip.log + +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 +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 +mv trip.log xtrip.log +diff ctrip.fot xtrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS ctrip.log xtrip.log + +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 + +../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 +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 +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 +$DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index ea8e31ca6d1..309ee200324 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Peter Breitenlohner + + * euptrip.test (removed): Renamed ... + * euptriptest (new): ... into this. + * am/euptex.am: Adapted. + 2013-11-21 Peter Breitenlohner * euptrip/euptrip.diffs: For etrip.tex Version 2.6 [2013-11-21]. diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index 72700bca23f..303ab25d000 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -1,6 +1,6 @@ ## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX. ## -## Copyright (C) 2011-2013 Peter Breitenlohner +## Copyright (C) 2011-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## e-upTeX @@ -12,7 +12,7 @@ EXTRA_PROGRAMS += euptex # e-upTeX Tests # -euptex_tests = euptexdir/euptrip.test +euptex_tests = euptexdir/euptriptest EXTRA_DIST += $(euptex_tests) @@ -95,7 +95,7 @@ endif EUPTEX ## Test data and results ## -## eptexdir/eptrip.test +## eptexdir/eptriptest EXTRA_DIST += \ eptexdir/eptrip/etrip.log \ eptexdir/eptrip/etrip.tex \ diff --git a/Build/source/texk/web2c/euptexdir/euptrip.test b/Build/source/texk/web2c/euptexdir/euptrip.test deleted file mode 100755 index b755443084b..00000000000 --- a/Build/source/texk/web2c/euptexdir/euptrip.test +++ /dev/null @@ -1,115 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 Hironori Kitagawa -# Copyright (C) 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -testdir=$abs_srcdir/triptrap -etestdir=$abs_srcdir/etexdir/etrip -eptestdir=$abs_srcdir/eptexdir/eptrip -euptestdir=$abs_srcdir/euptexdir/euptrip - -TEXMFCNF=$euptestdir; export TEXMFCNF - -rm -rf euptripdir -mkdir euptripdir -cd euptripdir - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" - -echo ">>> Running e-TRIP test for e-upTeX." >&2 -echo ">>> See $euptestdir/euptrip.diffs for example of acceptable diffs." >&2 - -# upTeX outputs direction of boxes. -P_SED1='s/, yoko direction//;s/yoko direction, //' -P_SED2='s/yoko(math) direction, //' - -is_OK=: - -set -x - -echo "*** TRIP test for e-upTeX in compatibility mode ***." - -../pltotf $testdir/trip.pl trip.tfm || 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 . - -rm -f trip.log -../euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot -sed "$P_SED1" trip.log > cuptripin.log || exit 1 -diff $testdir/tripin.log cuptripin.log - -# May as well test non-ini second time through. -rm -f trip.log -../euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot -sed "$P_SED1;$P_SED2" trip.log > cuptrip.log -diff $testdir/trip.fot cuptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log - -eval ../dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ - -# ================================= - -echo "*** TRIP test for e-upTeX in extended mode ***." - -rm -f trip.log -../euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot -sed "$P_SED1" trip.log > xuptripin.log || exit 1 -diff $testdir/tripin.log xuptripin.log - -# May as well test non-ini second time through. -rm -f trip.log -../euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot -sed "$P_SED1;$P_SED2" trip.log > xuptrip.log -diff $testdir/trip.fot xuptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log - -eval ../dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ - -# ================================= - -echo "*** e-TeX specific part of e-TRIP test for e-upTeX ***." - -../pltotf $etestdir/etrip.pl etrip.tfm || 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 $eptestdir/etrip.tex . - -../euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot -sed "$P_SED1" etrip.log > euptripin.log || exit 1 -diff $etestdir/etripin.log euptripin.log - -# May as well test non-ini second time through. -../euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot -sed "$P_SED1;$P_SED2" etrip.log > euptrip.log -diff $etestdir/etrip.fot euptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/etrip.log euptrip.log - -eval ../dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 -$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/euptexdir/euptriptest b/Build/source/texk/web2c/euptexdir/euptriptest new file mode 100755 index 00000000000..b755443084b --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/euptriptest @@ -0,0 +1,115 @@ +#! /bin/sh + +# Copyright (C) 2010 Hironori Kitagawa +# Copyright (C) 2011-2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +testdir=$abs_srcdir/triptrap +etestdir=$abs_srcdir/etexdir/etrip +eptestdir=$abs_srcdir/eptexdir/eptrip +euptestdir=$abs_srcdir/euptexdir/euptrip + +TEXMFCNF=$euptestdir; export TEXMFCNF + +rm -rf euptripdir +mkdir euptripdir +cd euptripdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running e-TRIP test for e-upTeX." >&2 +echo ">>> See $euptestdir/euptrip.diffs for example of acceptable diffs." >&2 + +# upTeX outputs direction of boxes. +P_SED1='s/, yoko direction//;s/yoko direction, //' +P_SED2='s/yoko(math) direction, //' + +is_OK=: + +set -x + +echo "*** TRIP test for e-upTeX in compatibility mode ***." + +../pltotf $testdir/trip.pl trip.tfm || 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 . + +rm -f trip.log +../euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot +sed "$P_SED1" trip.log > cuptripin.log || exit 1 +diff $testdir/tripin.log cuptripin.log + +# May as well test non-ini second time through. +rm -f trip.log +../euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot +sed "$P_SED1;$P_SED2" trip.log > cuptrip.log +diff $testdir/trip.fot cuptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log + +eval ../dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ + +# ================================= + +echo "*** TRIP test for e-upTeX in extended mode ***." + +rm -f trip.log +../euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot +sed "$P_SED1" trip.log > xuptripin.log || exit 1 +diff $testdir/tripin.log xuptripin.log + +# May as well test non-ini second time through. +rm -f trip.log +../euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot +sed "$P_SED1;$P_SED2" trip.log > xuptrip.log +diff $testdir/trip.fot xuptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log + +eval ../dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ + +# ================================= + +echo "*** e-TeX specific part of e-TRIP test for e-upTeX ***." + +../pltotf $etestdir/etrip.pl etrip.tfm || 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 $eptestdir/etrip.tex . + +../euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot +sed "$P_SED1" etrip.log > euptripin.log || exit 1 +diff $etestdir/etripin.log euptripin.log + +# May as well test non-ini second time through. +../euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot +sed "$P_SED1;$P_SED2" etrip.log > euptrip.log +diff $etestdir/etrip.fot euptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $eptestdir/etrip.log euptrip.log + +eval ../dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 +$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/mftraptest b/Build/source/texk/web2c/mftraptest new file mode 100755 index 00000000000..5b1498f9dbb --- /dev/null +++ b/Build/source/texk/web2c/mftraptest @@ -0,0 +1,41 @@ +#! /bin/sh + +# Copyright (C) 2009-2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +testdir=$abs_srcdir/triptrap + +TEXMFCNF=$testdir; export TEXMFCNF + +rm -rf trapdir +mkdir trapdir +cd trapdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running TRAP test for Metafont." >&2 +echo ">>> See $testdir/mftrap.diffs for example of acceptable diffs." >&2 + +set -x + +# get same filename in log +$LN_S $testdir/trap.mf . + +../mf --progname=inimf <$testdir/mftrap1.in >mftrapin.fot +mv trap.log mftrapin.log || exit 1 +diff $testdir/mftrapin.log mftrapin.log + +../mf --progname=inimf <$testdir/mftrap2.in >mftrap.fot +mv trap.log mftrap.log || exit 1 +mv trap.tfm mftrap.tfm || exit 1 +diff $testdir/mftrap.fot mftrap.fot +diff $testdir/mftrap.log mftrap.log + +../tftopl ./mftrap.tfm mftrap.pl || exit 1 +diff $testdir/mftrap.pl mftrap.pl + +../gftype -m -i ./trap.72270gf >trap.typ || exit 1 +diff $testdir/trap.typ trap.typ + +exit 0 + diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 79fd8b4324f..f78df4f1dc2 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Peter Breitenlohner + + * mptrap.test (removed): Renamed ... + * mptraptest (new): ... into this. + * am/mplib.am: Adapted. + 2014-01-06 Akira Kakuto * mp.w, mpmathdouble.w: Bug fixes by Taco, imported from MetaPost trunk. diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 0aaf250b3a2..5cceff38467 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-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## MetaPost @@ -63,7 +63,7 @@ DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-tangle ## MetaPost Tests ## -mp_tests = mplibdir/dvitomp.test mplibdir/mptrap.test +mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest EXTRA_DIST += $(mp_tests) @@ -75,9 +75,9 @@ TRIPTRAP_CLEAN += mptrap-clean endif MP DISTCLEANFILES += mptrap.diffs -## dvitomp.test +## mplibdir/dvitomp.test DISTCLEANFILES += ptmr.mpx tests/xptmr.mpx tests/xstory.mpx -## mptrap.test +## mplibdir/mptraptest mptrap.diffs: mpost$(EXEEXT) $(triptrap_diffs) $@ .PHONY: mptrap-clean diff --git a/Build/source/texk/web2c/mplibdir/mptrap.test b/Build/source/texk/web2c/mplibdir/mptrap.test deleted file mode 100755 index 86203400491..00000000000 --- a/Build/source/texk/web2c/mplibdir/mptrap.test +++ /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 b/Build/source/texk/web2c/mplibdir/mptraptest new file mode 100755 index 00000000000..86203400491 --- /dev/null +++ b/Build/source/texk/web2c/mplibdir/mptraptest @@ -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 + diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 4a87883a033..f45ac6ec5b3 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Peter Breitenlohner + + * ptrip.test (removed): Renamed ... + * ptriptest (new): ... into this. + * am/ptex.am: Adapted. + 2013-12-31 Peter Breitenlohner * ptftopl.ch, tests/min10.pl, tests/min10.pl: Don't write diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 9a4659e4035..46a31b19740 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-2013 Peter Breitenlohner +## Copyright (C) 2010-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) @@ -12,7 +12,7 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl # pTeX Tests # -ptex_tests = ptexdir/ptrip.test +ptex_tests = ptexdir/ptriptest pweb_tests = \ ptexdir/pbibtex.test \ ptexdir/pdvitype.test \ @@ -217,7 +217,7 @@ DISTCLEANFILES += ptests/xsample.typ EXTRA_DIST += ptexdir/tests/min10.pl ptexdir/tests/min10.tfm EXTRA_DIST += ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm DISTCLEANFILES += ptests/x*min10.* -## ptexdir/ptrip.test +## ptexdir/ptriptest EXTRA_DIST += ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf ptrip.diffs: ptex$(EXEEXT) $(triptrap_diffs) $@ diff --git a/Build/source/texk/web2c/ptexdir/ptrip.test b/Build/source/texk/web2c/ptexdir/ptrip.test deleted file mode 100755 index 4b00cd35a55..00000000000 --- a/Build/source/texk/web2c/ptexdir/ptrip.test +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -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 - -# pTeX outputs direction of boxes. -P_SED1='s/, yoko direction//;s/yoko direction, //' -P_SED2='s/yoko(math) direction, //' - -is_OK=: - -set -x - -echo "*** TRIP test for pTeX ***." - -../pltotf $testdir/trip.pl trip.tfm || 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 . - -rm -f trip.log -../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 -sed "$P_SED1;$P_SED2" trip.log > ptrip.log -diff $testdir/trip.fot ptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log ptrip.log - -eval ../dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/ptexdir/ptriptest b/Build/source/texk/web2c/ptexdir/ptriptest new file mode 100755 index 00000000000..4b00cd35a55 --- /dev/null +++ b/Build/source/texk/web2c/ptexdir/ptriptest @@ -0,0 +1,61 @@ +#! /bin/sh + +# Copyright (C) 2010-2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +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 + +# pTeX outputs direction of boxes. +P_SED1='s/, yoko direction//;s/yoko direction, //' +P_SED2='s/yoko(math) direction, //' + +is_OK=: + +set -x + +echo "*** TRIP test for pTeX ***." + +../pltotf $testdir/trip.pl trip.tfm || 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 . + +rm -f trip.log +../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 +sed "$P_SED1;$P_SED2" trip.log > ptrip.log +diff $testdir/trip.fot ptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log ptrip.log + +eval ../dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/trap.test b/Build/source/texk/web2c/trap.test deleted file mode 100755 index 5b1498f9dbb..00000000000 --- a/Build/source/texk/web2c/trap.test +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2009-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -testdir=$abs_srcdir/triptrap - -TEXMFCNF=$testdir; export TEXMFCNF - -rm -rf trapdir -mkdir trapdir -cd trapdir - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" - -echo ">>> Running TRAP test for Metafont." >&2 -echo ">>> See $testdir/mftrap.diffs for example of acceptable diffs." >&2 - -set -x - -# get same filename in log -$LN_S $testdir/trap.mf . - -../mf --progname=inimf <$testdir/mftrap1.in >mftrapin.fot -mv trap.log mftrapin.log || exit 1 -diff $testdir/mftrapin.log mftrapin.log - -../mf --progname=inimf <$testdir/mftrap2.in >mftrap.fot -mv trap.log mftrap.log || exit 1 -mv trap.tfm mftrap.tfm || exit 1 -diff $testdir/mftrap.fot mftrap.fot -diff $testdir/mftrap.log mftrap.log - -../tftopl ./mftrap.tfm mftrap.pl || exit 1 -diff $testdir/mftrap.pl mftrap.pl - -../gftype -m -i ./trap.72270gf >trap.typ || exit 1 -diff $testdir/trap.typ trap.typ - -exit 0 - diff --git a/Build/source/texk/web2c/trip.test b/Build/source/texk/web2c/trip.test deleted file mode 100755 index 23c37904f39..00000000000 --- a/Build/source/texk/web2c/trip.test +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2009-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -testdir=$abs_srcdir/triptrap - -TEXMFCNF=$testdir; export TEXMFCNF - -rm -rf tripdir -mkdir tripdir -cd tripdir - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" - -echo ">>> Running TRIP test for TeX." >&2 -echo ">>> See $testdir/trip.diffs for example of acceptable diffs." >&2 - -is_OK=: - -set -x - -../pltotf $testdir/trip.pl trip.tfm || 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 . - -../tex --progname=initex --ini <$testdir/trip1.in >tripin.fot -mv trip.log tripin.log || exit 1 -diff $testdir/tripin.log tripin.log - -# May as well test non-ini second time through. -../tex --progname=tex <$testdir/trip2.in >trip.fot -diff $testdir/trip.fot trip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log trip.log - -eval ../dvitype $dvitype_args trip.dvi >trip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ trip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/triptest b/Build/source/texk/web2c/triptest new file mode 100755 index 00000000000..23c37904f39 --- /dev/null +++ b/Build/source/texk/web2c/triptest @@ -0,0 +1,51 @@ +#! /bin/sh + +# Copyright (C) 2009-2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +testdir=$abs_srcdir/triptrap + +TEXMFCNF=$testdir; export TEXMFCNF + +rm -rf tripdir +mkdir tripdir +cd tripdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running TRIP test for TeX." >&2 +echo ">>> See $testdir/trip.diffs for example of acceptable diffs." >&2 + +is_OK=: + +set -x + +../pltotf $testdir/trip.pl trip.tfm || 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 . + +../tex --progname=initex --ini <$testdir/trip1.in >tripin.fot +mv trip.log tripin.log || exit 1 +diff $testdir/tripin.log tripin.log + +# May as well test non-ini second time through. +../tex --progname=tex <$testdir/trip2.in >trip.fot +diff $testdir/trip.fot trip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log trip.log + +eval ../dvitype $dvitype_args trip.dvi >trip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ trip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/triptrap-sh b/Build/source/texk/web2c/triptrap-sh index 9e3b9b8ece3..c255f2ee114 100755 --- a/Build/source/texk/web2c/triptrap-sh +++ b/Build/source/texk/web2c/triptrap-sh @@ -19,26 +19,26 @@ echo "$me: Running TRIP and TRAP tests and creating diffs." for file do case $file in - trip.diffs) tst=trip; msg='TRIP test for TeX';; - mftrap.diffs) tst=trap; msg='TRAP test for Metafont';; - mptrap.diffs) tst=mplibdir/mptrap; msg='MPTRAP test for MetaPost';; - etrip.diffs) tst=etexdir/etrip; msg='e-TRIP test for e-TeX';; - ptrip.diffs) tst=ptexdir/ptrip; msg='TRIP test for pTeX';; - eptrip.diffs) tst=eptexdir/eptrip; msg='e-TRIP test for e-pTeX';; - uptrip.diffs) tst=uptexdir/uptrip; msg='TRIP test for upTeX';; - euptrip.diffs) tst=euptexdir/euptrip; msg='e-TRIP test for e-upTeX';; + trip.diffs) tst=triptest; msg='TRIP test for TeX';; + mftrap.diffs) tst=mftraptest; msg='TRAP test for Metafont';; + mptrap.diffs) tst=mplibdir/mptraptest; msg='MPTRAP test for MetaPost';; + etrip.diffs) tst=etexdir/etriptest; msg='e-TRIP test for e-TeX';; + ptrip.diffs) tst=ptexdir/ptriptest; msg='TRIP test for pTeX';; + eptrip.diffs) tst=eptexdir/eptriptest; msg='e-TRIP test for e-pTeX';; + uptrip.diffs) tst=uptexdir/uptriptest; msg='TRIP test for upTeX';; + euptrip.diffs) tst=euptexdir/euptriptest; msg='e-TRIP test for e-upTeX';; *) echo "$me: Bad argument \`$file'"; exit 1;; esac echo ">>> Running $msg." - $MAKE TESTS=$tst.test check-am >$tmp 2>&1 \ - && grep "PASS: $tst\.test" $tmp >/dev/null 2>&1 \ - || { echo "FAIL: $tst.test"; exit 1; } + $MAKE TESTS=$tst check-am >$tmp 2>&1 \ + && grep "PASS: $tst" $tmp >/dev/null 2>&1 \ + || { echo "FAIL: $tst"; exit 1; } sed -e "s%$abs_srcdir/%SRCDIR/%" \ -e "s%\.\./%./%" \ $tst.log >$file - echo "PASS: $tst.test" >>$file + echo "PASS: $tst" >>$file rm -f $tmp - echo "PASS: $tst.test" + echo "PASS: $tst" done echo "$me: All done" diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index f0973043566..6579b0b77df 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Peter Breitenlohner + + * uptrip.test (removed): Renamed ... + * uptriptest (new): ... into this. + * am/uptex.am: Adapted. + 2013-12-31 Peter Breitenlohner * tests/min10.pl, tests/min10.pl: Don't write SEVENBITSAFEFLAG diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 6b486f73962..9cc6b12a101 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-2013 Peter Breitenlohner +## Copyright (C) 2011-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) @@ -11,7 +11,7 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) upweb_programs = upbibtex updvitype uppltotf uptftopl # upTeX Tests -uptex_tests = uptexdir/uptrip.test +uptex_tests = uptexdir/uptriptest upweb_tests = \ uptexdir/upbibtex.test \ uptexdir/updvitype.test \ @@ -193,7 +193,7 @@ DISTCLEANFILES += uptests/xcmr10.pl EXTRA_DIST += uptexdir/tests/min10.pl uptexdir/tests/min10.tfm EXTRA_DIST += uptexdir/tests/tmin10.pl uptexdir/tests/tmin10.tfm DISTCLEANFILES += uptests/x*min10.* -## uptexdir/uptrip.test +## uptexdir/uptriptest EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf uptrip.diffs: uptex$(EXEEXT) $(triptrap_diffs) $@ diff --git a/Build/source/texk/web2c/uptexdir/uptrip.test b/Build/source/texk/web2c/uptexdir/uptrip.test deleted file mode 100755 index e7b384cf825..00000000000 --- a/Build/source/texk/web2c/uptexdir/uptrip.test +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -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 - -# upTeX outputs direction of boxes. -P_SED1='s/, yoko direction//;s/yoko direction, //' -P_SED2='s/yoko(math) direction, //' - -is_OK=: - -set -x - -echo "*** TRIP test for upTeX ***." - -../pltotf $testdir/trip.pl trip.tfm || 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 . - -rm -f trip.log -../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 -sed "$P_SED1;$P_SED2" trip.log > uptrip.log -diff $testdir/trip.fot uptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log uptrip.log - -eval ../dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/Build/source/texk/web2c/uptexdir/uptriptest b/Build/source/texk/web2c/uptexdir/uptriptest new file mode 100755 index 00000000000..e7b384cf825 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uptriptest @@ -0,0 +1,61 @@ +#! /bin/sh + +# Copyright (C) 2011-2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +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 + +# upTeX outputs direction of boxes. +P_SED1='s/, yoko direction//;s/yoko direction, //' +P_SED2='s/yoko(math) direction, //' + +is_OK=: + +set -x + +echo "*** TRIP test for upTeX ***." + +../pltotf $testdir/trip.pl trip.tfm || 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 . + +rm -f trip.log +../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 +sed "$P_SED1;$P_SED2" trip.log > uptrip.log +diff $testdir/trip.fot uptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log uptrip.log + +eval ../dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + -- cgit v1.2.3