summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/Makefile.in42
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/etexdir/am/etex.am2
-rwxr-xr-xBuild/source/texk/web2c/etexdir/wprob.test12
-rw-r--r--Build/source/texk/web2c/omegaware/ChangeLog5
-rw-r--r--Build/source/texk/web2c/omegaware/am/omegaware.am4
-rwxr-xr-xBuild/source/texk/web2c/omegaware/otangle.test11
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am4
-rwxr-xr-xBuild/source/texk/web2c/pdftexdir/wprob.test12
10 files changed, 60 insertions, 42 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index e1b3b7c1dc3..863df5bb5e5 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1885,27 +1885,27 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
$(nodist_libmplib_a_SOURCES) mp-tangle mpmath-tangle \
psout-tangle svgout-tangle $(nodist_etex_SOURCES) etex.web \
etex.ch etex-web2c etex.p etex.pool etex-tangle etrip.diffs \
- wprob.log wprob.tex $(pweb_programs:=.c) $(pweb_programs:=.h) \
- $(pweb_programs:=.p) $(pweb_programs:=-web2c) \
- $(pweb_programs:=.web) $(nodist_ptex_SOURCES) ptex.web ptex.ch \
- ptex-web2c ptex.p ptex.pool ptex-tangle tests/nissya_bib.* \
+ ewprob.log ewprob.tex $(pweb_programs:=.c) \
+ $(pweb_programs:=.h) $(pweb_programs:=.p) \
+ $(pweb_programs:=-web2c) $(pweb_programs:=.web) \
+ $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
+ ptex.pool ptex-tangle tests/nissya_bib.* tests/xexampl.aux \
+ tests/xexampl.bbl tests/xexampl.blg ptests/memtest.bib \
+ ptests/memtest?.* tests/xstory.dvityp tests/xpagenum.typ \
+ tests/xcmr10.tfm tests/xcmr10.pl tests/xsample.typ \
+ tests/x*min10.* ptrip.diffs $(nodist_eptex_SOURCES) eptex.web \
+ eptex.ch eptex-web2c eptex.p eptex.pool eptex-tangle \
+ eptrip.diffs $(upweb_programs:=.c) $(upweb_programs:=.h) \
+ $(upweb_programs:=.p) $(upweb_programs:=-web2c) \
+ $(upweb_programs:=.web) $(nodist_uptex_SOURCES) uptex.web \
+ uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \
tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg \
- ptests/memtest.bib ptests/memtest?.* tests/xstory.dvityp \
- tests/xpagenum.typ tests/xcmr10.tfm tests/xcmr10.pl \
- tests/xsample.typ tests/x*min10.* ptrip.diffs \
- $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
- eptex.pool eptex-tangle eptrip.diffs $(upweb_programs:=.c) \
- $(upweb_programs:=.h) $(upweb_programs:=.p) \
- $(upweb_programs:=-web2c) $(upweb_programs:=.web) \
- $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \
- uptex.pool uptex-tangle tests/xexampl.aux tests/xexampl.bbl \
- tests/xexampl.blg tests/xstory.dvityp tests/xpagenum.typ \
- tests/xcmr10.tfm tests/xcmr10.pl uptrip.diffs \
- $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
- euptex.p euptex.pool euptex-tangle euptrip.diffs \
- $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
- pdftex.pool pdftex-tangle wprob.log wprob.tex test-13.pdf \
- test-13.xref test-15.pdf test-15.xref \
+ tests/xstory.dvityp tests/xpagenum.typ tests/xcmr10.tfm \
+ tests/xcmr10.pl uptrip.diffs $(nodist_euptex_SOURCES) \
+ euptex.web euptex.ch euptex-web2c euptex.p euptex.pool \
+ euptex-tangle euptrip.diffs $(nodist_pdftex_SOURCES) pdftex.ch \
+ pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \
+ pwprob.tex test-13.pdf test-13.xref test-15.pdf test-15.xref \
$(nodist_libluatex_a_SOURCES) txt2zlib.c \
$(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c xetex.p \
xetex.pool xetex-tangle $(omegaware_programs:=.c) \
@@ -1915,7 +1915,7 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
ofont*vf omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
- omegaware/tests/xOCherokee.* cftest.p \
+ omegaware/tests/xOCherokee.* ocftest.* \
omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
omegaware/tests/sample*.ofm omegaware/tests/sample.ovf \
omegaware/tests/sample1-h.opl omegaware/tests/xsample.out \
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index c6209ea517e..f7b266634cf 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * wprob.test: Avoid spurious failure of parallel-tests.
+ * am/etex.am: Renamed wprob.{tex,log} => ewprob.{tex,log}.
+
2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/etex.am, etrip.test: Enable parallel-tests.
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 379740f0c5e..6b193a4b45b 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -88,7 +88,7 @@ DISTCLEANFILES += etrip.diffs
## wprob.test
EXTRA_DIST += tests/wprob.tex
-DISTCLEANFILES += wprob.log wprob.tex
+DISTCLEANFILES += ewprob.log ewprob.tex
## etrip.test
etrip.diffs: etex$(EXEEXT)
$(triptrap_diffs) $@
diff --git a/Build/source/texk/web2c/etexdir/wprob.test b/Build/source/texk/web2c/etexdir/wprob.test
index c1908c516c4..44e12536833 100755
--- a/Build/source/texk/web2c/etexdir/wprob.test
+++ b/Build/source/texk/web2c/etexdir/wprob.test
@@ -1,14 +1,14 @@
#! /bin/sh
-# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-rm -rf wprob.*
-cp $srcdir/tests/wprob.tex .
+rm -rf ewprob.*
+cp $srcdir/tests/wprob.tex ./ewprob.tex
TEXMFCNF=$srcdir/../kpathsea \
- ./etex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
+ ./etex --ini --etex --file-line-error --interaction=nonstopmode ewprob.tex
-grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
- wprob.log || exit 1
+grep '^\./ewprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
+ ewprob.log || exit 1
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index f01a39ed653..72ac00ec971 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * otangle.test: Avoid spurious failure of parallel-tests.
+ * am/etex.am: Renamed cftest.{web,ch,p} => cftest.{web,ch,p}.
+
2012-12-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/omegaware.am: Enable silent rules.
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index 88bbdebf960..8e2ac0fd64b 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -1,6 +1,6 @@
## texk/web2c/omegaware/am/omegaware.am: Makefile fragment for omegaware web programs.
##
-## 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.
omegaware_tools = odvicopy odvitype otangle wovp2ovf
@@ -146,7 +146,7 @@ DISTCLEANFILES += omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.*
## omegaware/otangle.test
-DISTCLEANFILES += cftest.p
+DISTCLEANFILES += ocftest.*
## omegaware/realnum.test
EXTRA_DIST += omegaware/tests/realnum.opl omegaware/tests/realnum.out
DISTCLEANFILES += omegaware/tests/xrealnum.*
diff --git a/Build/source/texk/web2c/omegaware/otangle.test b/Build/source/texk/web2c/omegaware/otangle.test
index 5bccef12ad0..d0dc10db359 100755
--- a/Build/source/texk/web2c/omegaware/otangle.test
+++ b/Build/source/texk/web2c/omegaware/otangle.test
@@ -1,10 +1,13 @@
#! /bin/sh
-# Copyright (C) 2009 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.
-TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=$srcdir/cftests \
- ./otangle cftest cftest || exit 1
+rm -rf ocftest.*
+cp $srcdir/cftests/cftest.web ./ocftest.web
-diff cftest.p $srcdir/cftests/ocftest.p || exit 1
+TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=.:$srcdir/cftests \
+ ./otangle ocftest cftest || exit 1
+
+diff ocftest.p $srcdir/cftests/ocftest.p || exit 1
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index f01489fae89..f6de8449422 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * wprob.test: Avoid spurious failure of parallel-tests.
+ * am/pdftex.am: Renamed wprob.{tex,log} => pwprob.{tex,log}.
+
2013-01-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* macnames.c, pdftex-common.h, pdftoepdf.cc, ttf2afm.c,
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index d0beb0bb46a..26f0296b476 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -1,6 +1,6 @@
## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
##
-## 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.
pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
@@ -91,5 +91,5 @@ endif PDFTEX
## wprob.test
EXTRA_DIST += tests/wprob.tex
-DISTCLEANFILES += wprob.log wprob.tex
+DISTCLEANFILES += pwprob.log pwprob.tex
diff --git a/Build/source/texk/web2c/pdftexdir/wprob.test b/Build/source/texk/web2c/pdftexdir/wprob.test
index 1af5f5d75f6..0e07e3038d3 100755
--- a/Build/source/texk/web2c/pdftexdir/wprob.test
+++ b/Build/source/texk/web2c/pdftexdir/wprob.test
@@ -1,14 +1,14 @@
#! /bin/sh
-# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-rm -rf wprob.*
-cp $srcdir/tests/wprob.tex .
+rm -rf pwprob.*
+cp $srcdir/tests/wprob.tex ./pwprob.tex
TEXMFCNF=$srcdir/../kpathsea \
- ./pdftex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
+ ./pdftex --ini --etex --file-line-error --interaction=nonstopmode pwprob.tex
-grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
- wprob.log || exit 1
+grep '^\./pwprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
+ pwprob.log || exit 1
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 15:28:04 +0000