summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-17 19:06:20 +0000
committerKarl Berry <karl@freefriends.org>2019-12-17 19:06:20 +0000
commit10a7ffb1a8491cbb46e496c3aad5ef20a8cb4217 (patch)
tree72acabf12ea3fcf921501f850e631404ce68e7ca
parent91f88812766634e237adbc651370ffc5c3794135 (diff)
rm trap.base/trip.fmt before remaking
git-svn-id: svn://tug.org/texlive/trunk@53154 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rwxr-xr-xBuild/source/texk/web2c/mftraptest.test6
-rwxr-xr-xBuild/source/texk/web2c/triptest.test6
3 files changed, 12 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index fba78774404..dcf4334008a 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,5 +1,9 @@
2019-12-17 Karl Berry <karl@freefriends.org>
+ * mftraptest.test,
+ triptest.test: rm the .base/.fmt file before remaking it,
+ so we can't find one left over from a previous run.
+
* am/web.am (web_tests): add tests/bibtex-bigauth.test (forgot
yesterday).
diff --git a/Build/source/texk/web2c/mftraptest.test b/Build/source/texk/web2c/mftraptest.test
index afe66b73f00..d50909e61ad 100755
--- a/Build/source/texk/web2c/mftraptest.test
+++ b/Build/source/texk/web2c/mftraptest.test
@@ -1,6 +1,6 @@
#! /bin/sh -vx
# $Id$
-# Copyright 2017-2018 Karl Berry <tex-live@tug.org>
+# Copyright 2017-2019 Karl Berry <tex-live@tug.org>
# Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
@@ -49,8 +49,10 @@ is_OK=:
set -x
# get same filename in log
-$LN_S $testdir/trap.mf .
+rm -f trap.mf
+$LN_S $testdir/trap.mf . || exit 1
+rm -f trap.base
../mf --progname=inimf <$testdir/mftrap1.in >mftrapin.fot
if test ! -s trap.base; then
echo "*** trap.base not created by mftrap1.in, investigate!" >&2
diff --git a/Build/source/texk/web2c/triptest.test b/Build/source/texk/web2c/triptest.test
index c0c3165be2f..e1cc7aa4f6a 100755
--- a/Build/source/texk/web2c/triptest.test
+++ b/Build/source/texk/web2c/triptest.test
@@ -1,6 +1,6 @@
#! /bin/sh -vx
# $Id$
-# Copyright 2017-2018 Karl Berry <tex-live@tug.org>
+# Copyright 2017-2019 Karl Berry <tex-live@tug.org>
# Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
@@ -64,8 +64,10 @@ set -x
diff $testdir/trip.pl trip.pl || is_OK=false
# get same filename in log
-$LN_S $testdir/trip.tex .
+rm -f trip.tex
+$LN_S $testdir/trip.tex . || exit 1
+rm -f trip.fmt
../tex --progname=initex --ini <$testdir/trip1.in >tripin.fot
if test ! -s trip.fmt; then
echo "*** trip.fmt not created by trip1.in, investigate!" >&2