uptexdir: more strict test

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

5 files changed, 18 insertions, 7 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 53db02b85f3..498500d1588 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -3070,10 +3070,11 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \
 	uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm \
 	uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm \
-	uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf \
-	$(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
-	euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \
-	euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \
+	uptexdir/tests/gkhugeng.err uptexdir/uptrip/uptrip.diffs \
+	uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \
+	euptexdir/euptex.defines euptexdir/COPYRIGHT \
+	euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
+	euptexdir/EUPTEX.txt $(euptex_tests) \
 	eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
 	euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
 	euptexdir/pdfprimitive.test \
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 339264961d2..dfdb796a76d 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-18  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* gkhuge.test: More strict test.
+	* tests/gkhugeng.err: Added.
+	* am/uptex.am: Adjust.
+
 2018-06-14  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* ksnji.h, kanji.c, uptex.defines:
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index 9c8c60de5d7..894a89b2ca6 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -211,7 +211,7 @@ DISTCLEANFILES += uptests/xtestnewu.*
 EXTRA_DIST += uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm
 DISTCLEANFILES += uptests/*uparse.*
 ## uptexdir/gkhuge.test
-EXTRA_DIST += uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm
+EXTRA_DIST += uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm uptexdir/tests/gkhugeng.err
 DISTCLEANFILES += uptests/*gkhuge*.*
 ## uptexdir/uptriptest
 EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf
diff --git a/Build/source/texk/web2c/uptexdir/gkhuge.test b/Build/source/texk/web2c/uptexdir/gkhuge.test
index 11c4758157b..e3746d1f3fc 100755
--- a/Build/source/texk/web2c/uptexdir/gkhuge.test
+++ b/Build/source/texk/web2c/uptexdir/gkhuge.test
@@ -29,8 +29,9 @@ for font in gkhugeng; do
   # The invalid gkhugeng.tfm was erroneously created before
   # web2c/pltotf.ch change 2017-09-10, due to overflow
   TEXMFCNF=$srcdir/../kpathsea \
-    ./uptftopl -verbose $testdir/$font.tfm uptests/y$font.pl \
-      && exit 1 || echo
+    ./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
 
 done
 
diff --git a/Build/source/texk/web2c/uptexdir/tests/gkhugeng.err b/Build/source/texk/web2c/uptexdir/tests/gkhugeng.err
new file mode 100644
index 00000000000..484f95d3bad
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/tests/gkhugeng.err
@@ -0,0 +1,3 @@
+Input file is in YOKO-kumi kanji tfm format.
+The fifth byte of the input file exceeds 127!
+Sorry, but I can't go on; are you sure this is a TFM?