summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/omegaware
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-24 07:52:22 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-24 07:52:22 +0000
commit2a01f72400e8c5fe2544bb98c92f05df313c3522 (patch)
tree5bdf4313fe5a52a5d2ebefbe20cce12c5058ff70 /Build/source/texk/web2c/omegaware
parentc8d2abcd493229d46a87834412470ee7bf52b515 (diff)
texk/web2c: Avoid spurious failures of parallel-tests
git-svn-id: svn://tug.org/texlive/trunk@28926 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/omegaware')
-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
3 files changed, 14 insertions, 6 deletions
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