texk/dvipdfm-x: Fix the new xbmc test

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

6 files changed, 18 insertions, 15 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 50237bf6da7..9bbf6127689 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -19,9 +19,8 @@
 	and set it to 1 when DVI id equals XDV_ID.
 
 	* pdfdev.c (pdf_dev_locate_font): Don't crash if mrec is None.
-	* dvipdfm.test, xdvipdfm.test, tests/xbmc10.{dvi,tex}, Makefile.am:
-	Test the above bug.
-
+	* dvipdfm.test, xdvipdfm.test, Makefile.am: Test the above bug.
+	* tests/xbmc.{dvi,tex}, tests/xbmc10.{600pk,tfm}: New test data.
 
 2014-07-28  Jiang Jiang  <gzjjgod@gmail.com>
 
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 73dd65cdb0e..c140cdf0c9f 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -302,5 +302,5 @@ EXTRA_DIST += tests/image.dvi tests/image.tex
 EXTRA_DIST += tests/cmr10.pfb tests/cmr10.tfm tests/annot.dvi tests/annot.tex
 EXTRA_DIST += tests/bookm.dvi tests/bookm.tex tests/paper.dvi tests/paper.tex
 EXTRA_DIST += tests/resrc.dvi tests/resrc.tex
-EXTRA_DIST += tests/xbmc.dvi tests/xbmc.tex tests/xbmc10.tfm
-DISTCLEANFILES += img*.* pic*.* image*.pdf annot*.pdf bookm*.pdf paper*.pdf resrc*.pdf xbmc.pdf
+EXTRA_DIST += tests/xbmc.dvi tests/xbmc.tex tests/xbmc10.600pk tests/xbmc10.tfm
+DISTCLEANFILES += img*.* pic*.* image*.pdf annot*.pdf bookm*.pdf paper*.pdf resrc*.pdf xbmc*.pdf
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 78c3c906940..a54cd3b54a5 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -801,7 +801,7 @@ dist_mapdata_DATA = data/cid-x.map
 cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx
 dist_cmapdata_DATA = data/EUC-UCS2
 DISTCLEANFILES = config.force img*.* pic*.* image*.pdf annot*.pdf \
-	bookm*.pdf paper*.pdf resrc*.pdf xbmc.pdf
+	bookm*.pdf paper*.pdf resrc*.pdf xbmc*.pdf
 TESTS = $(am__append_6) $(am__append_7)
 dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test \
 	dvipdfm-bkm.test dvipdfm-psz.test dvipdfm-res.test
@@ -818,7 +818,7 @@ EXTRA_DIST = $(dvipdfmx_tests) $(xdvipdfmx_tests) tests/dvipdfmx.cfg \
 	tests/cmr10.tfm tests/annot.dvi tests/annot.tex \
 	tests/bookm.dvi tests/bookm.tex tests/paper.dvi \
 	tests/paper.tex tests/resrc.dvi tests/resrc.tex tests/xbmc.dvi \
-	tests/xbmc.tex tests/xbmc10.tfm
+	tests/xbmc.tex tests/xbmc10.600pk tests/xbmc10.tfm
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.test b/Build/source/texk/dvipdfm-x/dvipdfmx.test
index 72c6a18229a..77227c22266 100755
--- a/Build/source/texk/dvipdfm-x/dvipdfmx.test
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2013, 2013 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 
@@ -8,7 +8,9 @@ TEXMFCNF=$srcdir/../kpathsea
 TEXFONTMAPS="$srcdir/tests;$srcdir/data"
 DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data"
 TEXPICTS=$srcdir/tests
-export TEXMFCNF TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS
+TEXFONTS=$srcdir/tests
+PKFONTS=$srcdir/tests
+export TEXMFCNF TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS PKFONTS
 
 failed=
 
@@ -27,8 +29,8 @@ echo "*** dvipdfmx -v -o image1.pdf image" && echo \
 	&& echo && echo "dvipdfmx-image tests OK" && echo \
 	|| failed="$failed dvipdfmx-image"	
 
-echo "*** dvipdfmx -v xbmc" && echo \
-	&& ./dvipdfmx -v $srcdir/tests/xbmc \
+echo "*** dvipdfmx -v -o xbmc1.pdf xbmc" && echo \
+	&& ./dvipdfmx -v -o xbmc1.pdf $srcdir/tests/xbmc \
 	&& echo && echo "dvipdfmx-xbmc tests OK" && echo \
 	|| failed="$failed dvipdfmx-xbmc"
 
diff --git a/Build/source/texk/dvipdfm-x/tests/xbmc10.600pk b/Build/source/texk/dvipdfm-x/tests/xbmc10.600pk
new file mode 100644
index 00000000000..1c51bd1ab74
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/xbmc10.600pk
diff --git a/Build/source/texk/dvipdfm-x/xdvipdfmx.test b/Build/source/texk/dvipdfm-x/xdvipdfmx.test
index 51688143cdc..8e899f36f4b 100755
--- a/Build/source/texk/dvipdfm-x/xdvipdfmx.test
+++ b/Build/source/texk/dvipdfm-x/xdvipdfmx.test
@@ -1,13 +1,15 @@
 #! /bin/sh
 
-# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea
 TEXFONTMAPS="$srcdir/tests;$srcdir/data"
 DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data"
 TEXPICTS=$srcdir/tests
-export TEXMFCNF TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS
+TEXFONTS=$srcdir/tests
+PKFONTS=$srcdir/tests
+export TEXMFCNF TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS PKFONTS
 
 failed=
 
@@ -26,8 +28,8 @@ echo "*** xdvipdfmx -v -o image2.pdf image" && echo \
 	&& echo && echo "xdvipdfmx-image tests OK" && echo \
 	|| failed="$failed xdvipdfmx-image"	
 
-echo "*** dvipdfmx -v xbmc" && echo \
-	&& ./dvipdfmx -v $srcdir/tests/xbmc \
+echo "*** dvipdfmx -v -o xbmc2.pdf xbmc" && echo \
+	&& ./dvipdfmx -v -o xbmc2.pdf  $srcdir/tests/xbmc \
 	&& echo && echo "dvipdfmx-xbmc tests OK" && echo \
 	|| failed="$failed dvipdfmx-xbmc"