summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/ChangeLog8
-rw-r--r--Build/source/texk/web2c/Makefile.in72
-rw-r--r--Build/source/texk/web2c/am/texmf.am10
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/eptexdir/am/eptex.am6
-rwxr-xr-xBuild/source/texk/web2c/eptexdir/eptriptest (renamed from Build/source/texk/web2c/eptexdir/eptrip.test)0
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/etexdir/am/etex.am6
-rwxr-xr-xBuild/source/texk/web2c/etexdir/etriptest (renamed from Build/source/texk/web2c/etexdir/etrip.test)0
-rw-r--r--Build/source/texk/web2c/euptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/euptexdir/am/euptex.am6
-rwxr-xr-xBuild/source/texk/web2c/euptexdir/euptriptest (renamed from Build/source/texk/web2c/euptexdir/euptrip.test)0
-rwxr-xr-xBuild/source/texk/web2c/mftraptest (renamed from Build/source/texk/web2c/trap.test)0
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am8
-rwxr-xr-xBuild/source/texk/web2c/mplibdir/mptraptest (renamed from Build/source/texk/web2c/mplibdir/mptrap.test)0
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am6
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/ptriptest (renamed from Build/source/texk/web2c/ptexdir/ptrip.test)0
-rwxr-xr-xBuild/source/texk/web2c/triptest (renamed from Build/source/texk/web2c/trip.test)0
-rwxr-xr-xBuild/source/texk/web2c/triptrap-sh26
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am6
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/uptriptest (renamed from Build/source/texk/web2c/uptexdir/uptrip.test)0
24 files changed, 145 insertions, 45 deletions
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 <peb@mppmu.mpg.de>
+
+ * 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 <peb@mppmu.mpg.de>
* 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 <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## 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 <peb@mppmu.mpg.de>
+
+ * eptrip.test (removed): Renamed ...
+ * eptriptest (new): ... into this.
+ * am/eptex.am: Adapted.
+
2013-11-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 <tex-live@tug.org>
+## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
## 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/eptriptest
index ed651194b3f..ed651194b3f 100755
--- a/Build/source/texk/web2c/eptexdir/eptrip.test
+++ b/Build/source/texk/web2c/eptexdir/eptriptest
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 <peb@mppmu.mpg.de>
+
+ * etrip.test (removed): Renamed ...
+ * etriptest (new): ... into this.
+ * am/etex.am: Adapted.
+
2013-11-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## 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/etriptest
index 4266de6ab46..4266de6ab46 100755
--- a/Build/source/texk/web2c/etexdir/etrip.test
+++ b/Build/source/texk/web2c/etexdir/etriptest
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 <peb@mppmu.mpg.de>
+
+ * euptrip.test (removed): Renamed ...
+ * euptriptest (new): ... into this.
+ * am/euptex.am: Adapted.
+
2013-11-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 <tex-live@tug.org>
+## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
## 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/euptriptest
index b755443084b..b755443084b 100755
--- a/Build/source/texk/web2c/euptexdir/euptrip.test
+++ b/Build/source/texk/web2c/euptexdir/euptriptest
diff --git a/Build/source/texk/web2c/trap.test b/Build/source/texk/web2c/mftraptest
index 5b1498f9dbb..5b1498f9dbb 100755
--- a/Build/source/texk/web2c/trap.test
+++ b/Build/source/texk/web2c/mftraptest
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 <peb@mppmu.mpg.de>
+
+ * mptrap.test (removed): Renamed ...
+ * mptraptest (new): ... into this.
+ * am/mplib.am: Adapted.
+
2014-01-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* 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 <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## 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/mptraptest
index 86203400491..86203400491 100755
--- a/Build/source/texk/web2c/mplibdir/mptrap.test
+++ b/Build/source/texk/web2c/mplibdir/mptraptest
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 <peb@mppmu.mpg.de>
+
+ * ptrip.test (removed): Renamed ...
+ * ptriptest (new): ... into this.
+ * am/ptex.am: Adapted.
+
2013-12-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 <tex-live@tug.org>
+## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
## 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/ptriptest
index 4b00cd35a55..4b00cd35a55 100755
--- a/Build/source/texk/web2c/ptexdir/ptrip.test
+++ b/Build/source/texk/web2c/ptexdir/ptriptest
diff --git a/Build/source/texk/web2c/trip.test b/Build/source/texk/web2c/triptest
index 23c37904f39..23c37904f39 100755
--- a/Build/source/texk/web2c/trip.test
+++ b/Build/source/texk/web2c/triptest
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 <peb@mppmu.mpg.de>
+
+ * uptrip.test (removed): Renamed ...
+ * uptriptest (new): ... into this.
+ * am/uptex.am: Adapted.
+
2013-12-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 <tex-live@tug.org>
+## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
## 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/uptriptest
index e7b384cf825..e7b384cf825 100755
--- a/Build/source/texk/web2c/uptexdir/uptrip.test
+++ b/Build/source/texk/web2c/uptexdir/uptriptest