texlive[48558] Build/source/texk/web2c/uptexdir: gkhuge.test: avoid

[commits+hironobu at tug.org]

Revision: 48558
          http://tug.org/svn/texlive?view=revision&revision=48558
Author:   hironobu
Date:     2018-09-03 13:42:11 +0200 (Mon, 03 Sep 2018)
Log Message:
-----------
gkhuge.test: avoid test failure on some platforms

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/uptexdir/ChangeLog
    trunk/Build/source/texk/web2c/uptexdir/gkhuge.test

Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2018-09-03 01:29:30 UTC (rev 48557)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2018-09-03 11:42:11 UTC (rev 48558)
@@ -1,3 +1,11 @@
+2018-09-03  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* 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  <h.y.acetaminophen at gmail.com>
 
 	* gkhuge.test: More strict test.

Modified: trunk/Build/source/texk/web2c/uptexdir/gkhuge.test
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/gkhuge.test	2018-09-03 01:29:30 UTC (rev 48557)
+++ trunk/Build/source/texk/web2c/uptexdir/gkhuge.test	2018-09-03 11:42:11 UTC (rev 48558)
@@ -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 @@
 
   # 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 @@
   # 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