From 59a4abef69373c5dc0d3d4661a4f4ae0a4a43918 Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Mon, 3 Sep 2018 11:42:11 +0000 Subject: gkhuge.test: avoid test failure on some platforms git-svn-id: svn://tug.org/texlive/trunk@48558 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/uptexdir/ChangeLog | 8 ++++++++ Build/source/texk/web2c/uptexdir/gkhuge.test | 17 +++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'Build/source/texk/web2c/uptexdir') diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index dfdb796a76d..6b34a03726c 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,11 @@ +2018-09-03 Hironobu Yamashita + + * gkhuge.test: Export TEXMFCNF beforehand, instead of setting + it at each one-line command execution. This should avoid test + failure on some platforms. + http://tug.org/pipermail/tlbuild/2018q3/004244.html + http://tug.org/pipermail/tlbuild/2018q3/004250.html + 2018-08-18 Hironobu Yamashita * gkhuge.test: More strict test. diff --git a/Build/source/texk/web2c/uptexdir/gkhuge.test b/Build/source/texk/web2c/uptexdir/gkhuge.test index e3746d1f3fc..d85c8d238dd 100755 --- a/Build/source/texk/web2c/uptexdir/gkhuge.test +++ b/Build/source/texk/web2c/uptexdir/gkhuge.test @@ -5,6 +5,9 @@ test -d uptests || mkdir -p uptests +TEXMFCNF=$srcdir/../kpathsea +export TEXMFCNF + # Test inputs testdir=$srcdir/uptexdir/tests @@ -14,10 +17,9 @@ for font in gkhugeok; do # This test is constructed as a cycle, since JPL source # of gkhugeok.tfm is so large. - TEXMFCNF=$srcdir/../kpathsea \ - ./uptftopl -verbose $testdir/$font.tfm uptests/y$font.pl && \ - ./uppltotf -verbose uptests/y$font.pl uptests/y$font.tfm && \ - cmp $testdir/$font.tfm uptests/y$font.tfm && echo || exit 1 + ./uptftopl -verbose $testdir/$font.tfm uptests/y$font.pl && \ + ./uppltotf -verbose uptests/y$font.pl uptests/y$font.tfm && \ + cmp $testdir/$font.tfm uptests/y$font.tfm && echo || exit 1 done @@ -28,10 +30,9 @@ for font in gkhugeng; do # error message, instead of trying to allocate too much. # The invalid gkhugeng.tfm was erroneously created before # web2c/pltotf.ch change 2017-09-10, due to overflow - TEXMFCNF=$srcdir/../kpathsea \ - ./uptftopl $testdir/$font.tfm uptests/y$font.pl \ - 2>uptests/y$font.err && exit 1 || echo - cmp $testdir/$font.err uptests/y$font.err && echo || exit 1 + ./uptftopl $testdir/$font.tfm uptests/y$font.pl \ + 2>uptests/y$font.err && exit 1 || echo + diff $testdir/$font.err uptests/y$font.err && echo || exit 1 done -- cgit v1.2.3