summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-02-15 10:06:11 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-02-15 10:06:11 +0000
commite38aa1c20001cca438c00dac4f5c0886d142f215 (patch)
tree116e9dc4ad83c5971e58eff4aec9619239b4bd24 /Build
parentd3936b33b2d2a5f0fbe7df3ee3774b1bcae2eefb (diff)
Fix several spurious parallel test failures
git-svn-id: svn://tug.org/texlive/trunk@29118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog7
-rw-r--r--Build/source/texk/web2c/Makefile.in16
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am14
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/nissya.test8
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/pbibtex-longline-test.pl11
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/pbibtex-openout-test.pl2
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/pbibtex.test8
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/pdvitype.test8
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/ppltotf.test6
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/ptftopl.test6
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/sample.test6
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/yokotate.test20
-rwxr-xr-xBuild/source/texk/web2c/tests/bibtex-longline-test.pl6
-rwxr-xr-xBuild/source/texk/web2c/tests/bibtex-openout-test.pl2
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am8
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/upbibtex.test8
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/updvitype.test8
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/uppltotf.test6
-rwxr-xr-xBuild/source/texk/web2c/uptexdir/uptftopl.test6
21 files changed, 97 insertions, 76 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index f1eca66e9f5..0ff51c076b6 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Avoid spurious failures of parallel tests.
+ * pbibtex-longline-test.pl: Use longline.bib from source tree.
+
+ * bibtex-openout-test.pl: Fix the input file location.
+
2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/texmf.am: Allow subdir-objects.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index a3f99e46324..483219ddeca 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1970,19 +1970,19 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
$(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 \
+ ptex.pool ptex-tangle ptests/nissya_bib.* ptests/xexampl.aux \
+ ptests/xexampl.bbl ptests/xexampl.blg ptests/memtest.bib \
+ ptests/memtest?.* ptests/xstory.dvityp ptests/xpagenum.typ \
+ ptests/xcmr10.tfm ptests/xcmr10.pl ptests/xsample.typ \
+ ptests/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) \
+ uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
+ uptests/xstory.dvityp uptests/xpagenum.typ uptests/xcmr10.tfm \
+ uptests/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 \
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index c90255555b5..956e5dae181 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,14 @@
+2013-02-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Avoid spurious failures of parallel tests.
+ * am/ptex.am, nissya.test, pbibtex.test, pdvitype.test,
+ ppltotf.test, ptftopl.test, sample.test, yokotate.test:
+ Change directory for temporary files from tests to ptests.
+ * pbibtex-longline-test.pl: Use plongline.aux as input together
+ with longline.bib from source tree.
+
+ * pbibtex-openout-test.pl: Fix the input file location.
+
2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/ptex.am, pbibtex-mem.test, ptrip.test:
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 68062ae007f..efb62833deb 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -201,25 +201,25 @@ endif PWEB
##
## ptexdir/nissya.test
EXTRA_DIST += ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst ptexdir/tests/sample.bib
-DISTCLEANFILES += tests/nissya_bib.*
+DISTCLEANFILES += ptests/nissya_bib.*
## ptexdir/pbibtex.test
-DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
+DISTCLEANFILES += ptests/xexampl.aux ptests/xexampl.bbl ptests/xexampl.blg
## ptexdir/pbibtex-mem.test
EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst
DISTCLEANFILES += ptests/memtest.bib ptests/memtest?.*
## ptexdir/pdvitype.test
-DISTCLEANFILES += tests/xstory.dvityp tests/xpagenum.typ
+DISTCLEANFILES += ptests/xstory.dvityp ptests/xpagenum.typ
## ptexdir/ppltotf.test
-DISTCLEANFILES += tests/xcmr10.tfm
+DISTCLEANFILES += ptests/xcmr10.tfm
## ptexdir/ptftopl.test
-DISTCLEANFILES += tests/xcmr10.pl
+DISTCLEANFILES += ptests/xcmr10.pl
## ptexdir/sample.test
EXTRA_DIST += ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi
-DISTCLEANFILES += tests/xsample.typ
+DISTCLEANFILES += ptests/xsample.typ
## ptexdir/yokotate.test
EXTRA_DIST += ptexdir/tests/min10.pl ptexdir/tests/min10.tfm
EXTRA_DIST += ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm
-DISTCLEANFILES += tests/x*min10.*
+DISTCLEANFILES += ptests/x*min10.*
## ptexdir/ptrip.test
EXTRA_DIST += ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf
ptrip.diffs: ptex$(EXEEXT)
diff --git a/Build/source/texk/web2c/ptexdir/nissya.test b/Build/source/texk/web2c/ptexdir/nissya.test
index 9275fd983b4..765f2d352db 100755
--- a/Build/source/texk/web2c/ptexdir/nissya.test
+++ b/Build/source/texk/web2c/ptexdir/nissya.test
@@ -1,16 +1,16 @@
#! /bin/sh
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
# Using data sent by Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
-cp $srcdir/ptexdir/tests/nissya_bib.aux tests/nissya_bib.aux
+cp $srcdir/ptexdir/tests/nissya_bib.aux ptests/nissya_bib.aux
TEXMFCNF=$srcdir/../kpathsea \
BSTINPUTS=$srcdir/ptexdir/tests \
BIBINPUTS=$srcdir/ptexdir/tests \
- ./pbibtex tests/nissya_bib || exit 1
+ ./pbibtex ptests/nissya_bib || exit 1
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex-longline-test.pl b/Build/source/texk/web2c/ptexdir/pbibtex-longline-test.pl
index a7db4dadea6..499833d9be9 100755
--- a/Build/source/texk/web2c/ptexdir/pbibtex-longline-test.pl
+++ b/Build/source/texk/web2c/ptexdir/pbibtex-longline-test.pl
@@ -14,19 +14,18 @@ sub main
# The blg and bbl file names are based on the aux name and cannot be
# overridden. We can't write to the aux (source) directory, though,
# because that's an absolute path and openout_any=p. Therefore, copy
- # the input files to our working directory.
- for my $ext ("aux", "bib") {
- &test_file_copy ("$srcdir/tests/longline.$ext", "./longline.$ext");
- }
+ # the input aux file to our working directory and rename it to avoid
+ # spurious parallel test failures.
+ &test_file_copy ("$srcdir/tests/longline.aux", "./plongline.aux");
# Run pBibTeX, quit if it fails.
- my $ret = &test_run ("./pbibtex", "./longline.aux");
+ my $ret = &test_run ("./pbibtex", "./plongline.aux");
return 1 if $ret != 0;
# There should be lines longer than 80 chars in the output.
# (In older versions of pBibTeX, they are forcibly split, with a %.)
local *IN;
- $IN = "longline.bbl";
+ $IN = "plongline.bbl";
open (IN) || die "open($IN) failed: $!";
while (<IN>) {
last if length ($_) >= 80;
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex-openout-test.pl b/Build/source/texk/web2c/ptexdir/pbibtex-openout-test.pl
index c733f60b691..cf24a6e329a 100755
--- a/Build/source/texk/web2c/ptexdir/pbibtex-openout-test.pl
+++ b/Build/source/texk/web2c/ptexdir/pbibtex-openout-test.pl
@@ -14,7 +14,7 @@ sub main
$ENV{"openout_any"} = "p"; # should already be in texmf.cnf, but ...
# .blg open of abs path should fail:
- my $ret = &test_run ("./pbibtex", "$srcdir/exampl.aux");
+ my $ret = &test_run ("./pbibtex", "$srcdir/tests/exampl.aux");
# The test fails if the program succeeded. Could also check the output.
my $bad = ($ret == 0);
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.test b/Build/source/texk/web2c/ptexdir/pbibtex.test
index 32b9f0b1e8a..67642b07010 100755
--- a/Build/source/texk/web2c/ptexdir/pbibtex.test
+++ b/Build/source/texk/web2c/ptexdir/pbibtex.test
@@ -1,14 +1,14 @@
#! /bin/sh
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
-cp $srcdir/tests/exampl.aux tests/xexampl.aux
+cp $srcdir/tests/exampl.aux ptests/xexampl.aux
TEXMFCNF=$srcdir/../kpathsea \
BSTINPUTS=$srcdir/tests \
BIBINPUTS=$srcdir/tests \
- ./pbibtex tests/xexampl || exit 1
+ ./pbibtex ptests/xexampl || exit 1
diff --git a/Build/source/texk/web2c/ptexdir/pdvitype.test b/Build/source/texk/web2c/ptexdir/pdvitype.test
index 86066c2b23e..1b472c21067 100755
--- a/Build/source/texk/web2c/ptexdir/pdvitype.test
+++ b/Build/source/texk/web2c/ptexdir/pdvitype.test
@@ -1,19 +1,19 @@
#! /bin/sh
-# Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
if tfmpath=`$KPSEWHICH cmbx10.tfm`; then
TEXMFCNF=$srcdir/../kpathsea \
TFMFONTS=`dirname "$tfmpath"` \
- ./pdvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1
+ ./pdvitype -show-opcodes $srcdir/tests/story >ptests/xstory.dvityp || exit 1
fi
TEXMFCNF=$srcdir/../kpathsea \
TFMFONTS=$srcdir/tests \
- ./pdvitype --p=\*.\*.2 $srcdir/tests/pagenum.dvi >tests/xpagenum.typ || exit 1
+ ./pdvitype --p=\*.\*.2 $srcdir/tests/pagenum.dvi >ptests/xpagenum.typ || exit 1
diff --git a/Build/source/texk/web2c/ptexdir/ppltotf.test b/Build/source/texk/web2c/ptexdir/ppltotf.test
index 5cd672c497c..fd3716969b6 100755
--- a/Build/source/texk/web2c/ptexdir/ppltotf.test
+++ b/Build/source/texk/web2c/ptexdir/ppltotf.test
@@ -1,9 +1,9 @@
#! /bin/sh
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
-./ppltotf -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1
+./ppltotf -verbose $srcdir/tests/cmr10 ptests/xcmr10 || exit 1
diff --git a/Build/source/texk/web2c/ptexdir/ptftopl.test b/Build/source/texk/web2c/ptexdir/ptftopl.test
index 6c8d06b80ea..1b41a74c1af 100755
--- a/Build/source/texk/web2c/ptexdir/ptftopl.test
+++ b/Build/source/texk/web2c/ptexdir/ptftopl.test
@@ -1,10 +1,10 @@
#! /bin/sh
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
TEXMFCNF=$srcdir/../kpathsea \
- ./ptftopl -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1
+ ./ptftopl -verbose $srcdir/tests/cmr10 ptests/xcmr10 || exit 1
diff --git a/Build/source/texk/web2c/ptexdir/sample.test b/Build/source/texk/web2c/ptexdir/sample.test
index 97cde057e01..473147fc013 100755
--- a/Build/source/texk/web2c/ptexdir/sample.test
+++ b/Build/source/texk/web2c/ptexdir/sample.test
@@ -1,9 +1,9 @@
#! /bin/sh
-# Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
tfmpath=`$KPSEWHICH cmbx10.tfm` || exit 77
@@ -15,5 +15,5 @@ testdir=$srcdir/ptexdir/tests
TEXMFCNF=$srcdir/../kpathsea \
TFMFONTS=$testdir:`dirname "$tfmgrandparent"`// \
- ./pdvitype -show-opcodes $testdir/sample >tests/xsample.typ || exit 1
+ ./pdvitype -show-opcodes $testdir/sample >ptests/xsample.typ || exit 1
diff --git a/Build/source/texk/web2c/ptexdir/yokotate.test b/Build/source/texk/web2c/ptexdir/yokotate.test
index d6f7465a85a..70232903323 100755
--- a/Build/source/texk/web2c/ptexdir/yokotate.test
+++ b/Build/source/texk/web2c/ptexdir/yokotate.test
@@ -1,9 +1,9 @@
#! /bin/sh
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-test -d tests || mkdir -p tests
+test -d ptests || mkdir -p ptests
# Test inputs
testdir=$srcdir/ptexdir/tests
@@ -11,18 +11,18 @@ testdir=$srcdir/ptexdir/tests
# Testing pPLtoTF/pTFtoPL for min10 (yoko=horiz) and tmin10 (tate=vert).
for font in min10 tmin10; do
- ./ppltotf -verbose $testdir/$font.pl tests/x$font.tfm && \
- cmp $testdir/$font.tfm tests/x$font.tfm || exit 1
+ ./ppltotf -verbose $testdir/$font.pl ptests/x$font.tfm && \
+ cmp $testdir/$font.tfm ptests/x$font.tfm || exit 1
TEXMFCNF=$srcdir/../kpathsea \
- ./ptftopl -charcode-format octal -verbose $testdir/$font.tfm tests/x$font.pl || exit 1
+ ./ptftopl -charcode-format octal -verbose $testdir/$font.tfm ptests/x$font.pl || exit 1
- ./ppltotf tests/x$font tests/xx$font && \
- cmp $testdir/$font.tfm tests/xx$font.tfm || exit 1
+ ./ppltotf ptests/x$font ptests/xx$font && \
+ cmp $testdir/$font.tfm ptests/xx$font.tfm || exit 1
- TEXMFCNF=$srcdir/../kpathsea TFMFONTS=tests \
- ./ptftopl -charcode-format=octal xx$font tests/xx$font && \
- diff tests/x$font.pl tests/xx$font.pl || exit 1
+ TEXMFCNF=$srcdir/../kpathsea TFMFONTS=ptests \
+ ./ptftopl -charcode-format=octal xx$font ptests/xx$font && \
+ diff ptests/x$font.pl ptests/xx$font.pl || exit 1
done
diff --git a/Build/source/texk/web2c/tests/bibtex-longline-test.pl b/Build/source/texk/web2c/tests/bibtex-longline-test.pl
index d800be2ef93..694378ef8cf 100755
--- a/Build/source/texk/web2c/tests/bibtex-longline-test.pl
+++ b/Build/source/texk/web2c/tests/bibtex-longline-test.pl
@@ -14,10 +14,8 @@ sub main
# The blg and bbl file names are based on the aux name and cannot be
# overridden. We can't write to the aux (source) directory, though,
# because that's an absolute path and openout_any=p. Therefore, copy
- # the input files to our working directory.
- for my $ext ("aux", "bib") {
- &test_file_copy ("$srcdir/tests/longline.$ext", "./longline.$ext");
- }
+ # the input aux file to our working directory.
+ &test_file_copy ("$srcdir/tests/longline.aux", "./longline.aux");
# Run BibTeX, quit if it fails.
my $ret = &test_run ("./bibtex", "./longline.aux");
diff --git a/Build/source/texk/web2c/tests/bibtex-openout-test.pl b/Build/source/texk/web2c/tests/bibtex-openout-test.pl
index cc00564e5d3..a9788545eb5 100755
--- a/Build/source/texk/web2c/tests/bibtex-openout-test.pl
+++ b/Build/source/texk/web2c/tests/bibtex-openout-test.pl
@@ -14,7 +14,7 @@ sub main
$ENV{"openout_any"} = "p"; # should already be in texmf.cnf, but ...
# .blg open of abs path should fail:
- my $ret = &test_run ("./bibtex", "$srcdir/exampl.aux");
+ my $ret = &test_run ("./bibtex", "$srcdir/tests/exampl.aux");
# The test fails if the program succeeded. Could also check the output.
my $bad = ($ret == 0);
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 07d7811b5fa..4a48408a7aa 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/uptex.am, upbibtex.test, updvitype.test, uppltotf.test,
+ uptftopl.test: Change directory for temporary files from tests
+ to uptests.
+
2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/uptex.am, uptrip.test: Enable parallel-tests.
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index ab265786dc3..e7b4de8b3cb 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -181,13 +181,13 @@ endif UPWEB
## Test data and results
##
## uptexdir/upbibtex.test
-DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
+DISTCLEANFILES += uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg
## uptexdir/updvitype.test
-DISTCLEANFILES += tests/xstory.dvityp tests/xpagenum.typ
+DISTCLEANFILES += uptests/xstory.dvityp uptests/xpagenum.typ
## uptexdir/uppltotf.test
-DISTCLEANFILES += tests/xcmr10.tfm
+DISTCLEANFILES += uptests/xcmr10.tfm
## uptexdir/uptftopl.test
-DISTCLEANFILES += tests/xcmr10.pl
+DISTCLEANFILES += uptests/xcmr10.pl
## uptexdir/uptrip.test
EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf
uptrip.diffs: uptex$(EXEEXT)
diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.test b/Build/source/texk/web2c/uptexdir/upbibtex.test
index ba59d7ad4e8..4e6f5c8f4a6 100755
--- a/Build/source/texk/web2c/uptexdir/upbibtex.test
+++ b/Build/source/texk/web2c/uptexdir/upbibtex.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.
-test -d tests || mkdir -p tests
+test -d uptests || mkdir -p uptests
-cp $srcdir/tests/exampl.aux tests/xexampl.aux
+cp $srcdir/tests/exampl.aux uptests/xexampl.aux
TEXMFCNF=$srcdir/../kpathsea \
BSTINPUTS=$srcdir/tests \
BIBINPUTS=$srcdir/tests \
- ./upbibtex tests/xexampl || exit 1
+ ./upbibtex uptests/xexampl || exit 1
diff --git a/Build/source/texk/web2c/uptexdir/updvitype.test b/Build/source/texk/web2c/uptexdir/updvitype.test
index f5e970ed9e1..f824e07455a 100755
--- a/Build/source/texk/web2c/uptexdir/updvitype.test
+++ b/Build/source/texk/web2c/uptexdir/updvitype.test
@@ -1,19 +1,19 @@
#! /bin/sh
-# Copyright (C) 2011-2012 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.
-test -d tests || mkdir -p tests
+test -d uptests || mkdir -p uptests
if tfmpath=`$KPSEWHICH cmbx10.tfm`; then
TEXMFCNF=$srcdir/../kpathsea \
TFMFONTS=`dirname "$tfmpath"` \
- ./updvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1
+ ./updvitype -show-opcodes $srcdir/tests/story >uptests/xstory.dvityp || exit 1
fi
TEXMFCNF=$srcdir/../kpathsea \
TFMFONTS=$srcdir/tests \
- ./updvitype --p=\*.\*.2 $srcdir/tests/pagenum.dvi >tests/xpagenum.typ || exit 1
+ ./updvitype --p=\*.\*.2 $srcdir/tests/pagenum.dvi >uptests/xpagenum.typ || exit 1
diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.test b/Build/source/texk/web2c/uptexdir/uppltotf.test
index ae7d9663332..8e6da33a785 100755
--- a/Build/source/texk/web2c/uptexdir/uppltotf.test
+++ b/Build/source/texk/web2c/uptexdir/uppltotf.test
@@ -1,9 +1,9 @@
#! /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.
-test -d tests || mkdir -p tests
+test -d uptests || mkdir -p uptests
-./uppltotf -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1
+./uppltotf -verbose $srcdir/tests/cmr10 uptests/xcmr10 || exit 1
diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.test b/Build/source/texk/web2c/uptexdir/uptftopl.test
index 8628eb339dc..4c9e48885ae 100755
--- a/Build/source/texk/web2c/uptexdir/uptftopl.test
+++ b/Build/source/texk/web2c/uptexdir/uptftopl.test
@@ -1,10 +1,10 @@
#! /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.
-test -d tests || mkdir -p tests
+test -d uptests || mkdir -p uptests
TEXMFCNF=$srcdir/../kpathsea \
- ./uptftopl -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1
+ ./uptftopl -verbose $srcdir/tests/cmr10 uptests/xcmr10 || exit 1