Fix several spurious parallel test failures

git-svn-id: svn://tug.org/texlive/trunk@29118 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 24 insertions, 18 deletions

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