XeTeX: Fix xetex-bug73.test

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

6 files changed, 106 insertions, 85 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index bd3da82749b..9b7b5e96ded 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2193,47 +2193,47 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	$(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines \
 	xetexdir/ChangeLog xetexdir/COPYING xetexdir/NEWS \
 	xetexdir/image/README xetexdir/unicode-char-prep.pl \
-	xetexdir/xewebmac.tex $(xetex_tests) omegaware/README \
-	omegaware/ChangeLog $(odvicopy_sources) $(odvitype_sources) \
-	omegaware/ofm2opl.web omegaware/ofm2opl.up \
-	omegaware/ofm2opl.ch omegaware/opl2ofm.web \
-	omegaware/opl2ofm.up omegaware/opl2ofm.ch $(otangle_sources) \
-	omegaware/ovf2ovp.web omegaware/ovf2ovp.up \
-	omegaware/ovf2ovp.ch omegaware/ovp2ovf.web \
-	omegaware/ovp2ovf.up omegaware/ovp2ovf.ch $(OTANGLE_tests) \
-	$(OMFONTS_tests) omegaware/tests/charwd-r.pl \
-	omegaware/tests/charwd-v.vpl omegaware/tests/level1.opl \
-	omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \
-	omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \
-	omegaware/tests/ofontd3.dvi omegaware/tests/ofontd3.typ \
-	omegaware/tests/ofontr1.vf omegaware/tests/ofontr2.ovf \
-	omegaware/tests/ofontr3.ovf omegaware/tests/ofontv4.vf \
-	omegaware/tests/ofontv5.ovf omegaware/tests/ofontv6.ovf \
-	omegaware/tests/ofontd0.dtl omegaware/tests/ofontd0.dvi \
-	omegaware/tests/ofontd0.typ omegaware/tests/ofontr0.tfm \
-	omegaware/tests/ofontr1.tfm omegaware/tests/ofontr2.ofm \
-	omegaware/tests/ofontr3.ofm omegaware/tests/ofontv4.tfm \
-	omegaware/tests/ofontv5.ofm omegaware/tests/ofontv6.ofm \
-	omegaware/tests/ofontr0.pl omegaware/tests/ofontr1.pl \
-	omegaware/tests/ofontr1.vpl omegaware/tests/ofontr2.opl \
-	omegaware/tests/ofontr2.ovp omegaware/tests/ofontr3.opl \
-	omegaware/tests/ofontr3.ovp omegaware/tests/ofontv4.pl \
-	omegaware/tests/ofontv4.vpl omegaware/tests/ofontv5.opl \
-	omegaware/tests/ofontv5.ovp omegaware/tests/ofontv6.opl \
-	omegaware/tests/ofontv6.ovp omegaware/tests/Cherokee.pl \
-	omegaware/tests/OCherokee.ovp omegaware/tests/inbmp.opl \
-	omegaware/tests/overbmp.opl omegaware/tests/overbmp.ovp \
-	omegaware/tests/realnum.opl omegaware/tests/realnum.out \
-	omegaware/tests/repeat.opl omegaware/tests/repeated.opl \
-	omegaware/tests/sample.out omegaware/tests/sample.ovp \
-	omegaware/tests/sample0-h.opl omegaware/tests/specialhex.ovp \
-	omegaware/tests/vrepeat0.ofm omegaware/tests/vrepeat0.opl \
-	omegaware/tests/vrepeat1.ofm omegaware/tests/vrepeat1.opl \
-	omegaware/tests/vrepeat1.ovf omegaware/tests/vrepeat1.ovp \
-	$(aleph_web_srcs) $(aleph_ch_srcs) alephdir/ChangeLog \
-	alephdir/aleph.defines alephdir/aleph.version $(aleph_tests) \
-	synctexdir/ChangeLog synctexdir/README.txt \
-	synctexdir/synctex_parser_readme.txt \
+	xetexdir/xewebmac.tex $(xetex_tests) xetexdir/tests/bug73.log \
+	xetexdir/tests/bug73.tex omegaware/README omegaware/ChangeLog \
+	$(odvicopy_sources) $(odvitype_sources) omegaware/ofm2opl.web \
+	omegaware/ofm2opl.up omegaware/ofm2opl.ch \
+	omegaware/opl2ofm.web omegaware/opl2ofm.up \
+	omegaware/opl2ofm.ch $(otangle_sources) omegaware/ovf2ovp.web \
+	omegaware/ovf2ovp.up omegaware/ovf2ovp.ch \
+	omegaware/ovp2ovf.web omegaware/ovp2ovf.up \
+	omegaware/ovp2ovf.ch $(OTANGLE_tests) $(OMFONTS_tests) \
+	omegaware/tests/charwd-r.pl omegaware/tests/charwd-v.vpl \
+	omegaware/tests/level1.opl omegaware/tests/ofontd1.dvi \
+	omegaware/tests/ofontd1.typ omegaware/tests/ofontd2.dvi \
+	omegaware/tests/ofontd2.typ omegaware/tests/ofontd3.dvi \
+	omegaware/tests/ofontd3.typ omegaware/tests/ofontr1.vf \
+	omegaware/tests/ofontr2.ovf omegaware/tests/ofontr3.ovf \
+	omegaware/tests/ofontv4.vf omegaware/tests/ofontv5.ovf \
+	omegaware/tests/ofontv6.ovf omegaware/tests/ofontd0.dtl \
+	omegaware/tests/ofontd0.dvi omegaware/tests/ofontd0.typ \
+	omegaware/tests/ofontr0.tfm omegaware/tests/ofontr1.tfm \
+	omegaware/tests/ofontr2.ofm omegaware/tests/ofontr3.ofm \
+	omegaware/tests/ofontv4.tfm omegaware/tests/ofontv5.ofm \
+	omegaware/tests/ofontv6.ofm omegaware/tests/ofontr0.pl \
+	omegaware/tests/ofontr1.pl omegaware/tests/ofontr1.vpl \
+	omegaware/tests/ofontr2.opl omegaware/tests/ofontr2.ovp \
+	omegaware/tests/ofontr3.opl omegaware/tests/ofontr3.ovp \
+	omegaware/tests/ofontv4.pl omegaware/tests/ofontv4.vpl \
+	omegaware/tests/ofontv5.opl omegaware/tests/ofontv5.ovp \
+	omegaware/tests/ofontv6.opl omegaware/tests/ofontv6.ovp \
+	omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp \
+	omegaware/tests/inbmp.opl omegaware/tests/overbmp.opl \
+	omegaware/tests/overbmp.ovp omegaware/tests/realnum.opl \
+	omegaware/tests/realnum.out omegaware/tests/repeat.opl \
+	omegaware/tests/repeated.opl omegaware/tests/sample.out \
+	omegaware/tests/sample.ovp omegaware/tests/sample0-h.opl \
+	omegaware/tests/specialhex.ovp omegaware/tests/vrepeat0.ofm \
+	omegaware/tests/vrepeat0.opl omegaware/tests/vrepeat1.ofm \
+	omegaware/tests/vrepeat1.opl omegaware/tests/vrepeat1.ovf \
+	omegaware/tests/vrepeat1.ovp $(aleph_web_srcs) \
+	$(aleph_ch_srcs) alephdir/ChangeLog alephdir/aleph.defines \
+	alephdir/aleph.version $(aleph_tests) synctexdir/ChangeLog \
+	synctexdir/README.txt synctexdir/synctex_parser_readme.txt \
 	synctexdir/synctex_parser_version.txt synctexdir/tests \
 	synctexdir/synctex-common.h synctexdir/synctex.c \
 	synctexdir/synctex.defines synctexdir/synctex.h \
@@ -2296,24 +2296,24 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
 	test-13.xref test-15.pdf test-15.xref \
 	$(nodist_libluatex_sources) luaimage.* luajitimage.* \
 	txt2zlib.c $(nodist_xetex_SOURCES) xetex.web xetex.ch \
-	xetex-web2c xetex.p xetex.pool xetex-tangle \
-	$(omegaware_programs:=.c) $(omegaware_programs:=.h) \
-	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
-	ofm2opl.web opl2ofm.web ovf2ovp.web ovp2ovf.web \
-	omegaware/tests/charwdr.* omegaware/tests/charwdv.* \
-	omegaware/tests/xlevel1.ofm omegaware/tests/xlevel1.opl \
-	ofont*vf omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
-	omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
-	omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
-	omegaware/tests/xOCherokee.* omegaware/tests/xinbmp* \
-	omegaware/tests/xoverbmp* ocftest.* omegaware/tests/xrealnum.* \
-	omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
-	omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
-	omegaware/tests/xsample*.out omegaware/tests/specialhex.ofm \
-	omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
-	omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
-	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
-	aleph.pool aleph-tangle
+	xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
+	bug73.log bug73.out bug73.tex $(omegaware_programs:=.c) \
+	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
+	$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
+	ovf2ovp.web ovp2ovf.web omegaware/tests/charwdr.* \
+	omegaware/tests/charwdv.* omegaware/tests/xlevel1.ofm \
+	omegaware/tests/xlevel1.opl ofont*vf omegaware/tests/xofont* \
+	omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
+	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
+	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
+	omegaware/tests/xinbmp* omegaware/tests/xoverbmp* ocftest.* \
+	omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
+	omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
+	omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
+	omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+	omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+	omegaware/tests/yrepeat* $(nodist_aleph_SOURCES) aleph.web \
+	aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = 
 TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
 	$(am__append_31) $(am__append_37) $(am__append_43) \
@@ -3287,7 +3287,10 @@ libxetex_prereq = xetexd.h $(xetex_dependencies)
 
 # XeTeX Tests
 #
-xetex_tests = xetexdir/xetex.test
+xetex_tests = \
+	xetexdir/xetex-bug73.test \
+	xetexdir/xetex.test
+
 omegaware_programs = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
 ow_tangle = WEBINPUTS=$(srcdir)/omegaware $(buildenv) $(TANGLE)
 ow_otangle = WEBINPUTS=.:$(srcdir)/omegaware $(buildenv) $(OTANGLE)
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index c45891302da..6a17ce9b324 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-15  Khaled Hosny  <khaledhosny@eglug.org>
+            Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* xetex-bug73.test: Shell script for a new test.
+	* tests/bug73.{log,tex} (new): Test input and expected output.
+	* am/xetex.am: Adjusted.
+
 2014-07-15  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* xetex_version.h: 0.99992
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 416a45ed8e6..41855700566 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -204,3 +204,7 @@ if XETEX
 TESTS += $(xetex_tests)
 endif XETEX
 
+## xetex-bug73.test
+EXTRA_DIST += xetexdir/tests/bug73.log xetexdir/tests/bug73.tex
+DISTCLEANFILES += bug73.fmt bug73.log bug73.out bug73.tex
+
diff --git a/Build/source/texk/web2c/xetexdir/tests/bug73.log b/Build/source/texk/web2c/xetexdir/tests/bug73.log
index bafe3392319..1cb6e810579 100644
--- a/Build/source/texk/web2c/xetexdir/tests/bug73.log
+++ b/Build/source/texk/web2c/xetexdir/tests/bug73.log
@@ -1,8 +1,7 @@
-entering extended mode
  restricted \write18 enabled.
  %&-line parsing enabled.
-**tests/bug73.tex
-(./tests/bug73.tex
+**bug73
+(./bug73.tex
 \everyvbox->\relax 
-[1] )
-Output written on bug73.pdf (1 page).
+ )
+No pages of output.
diff --git a/Build/source/texk/web2c/xetexdir/tests/bug73.tex b/Build/source/texk/web2c/xetexdir/tests/bug73.tex
index e9351ca31dc..dc3d2fef5f6 100644
--- a/Build/source/texk/web2c/xetexdir/tests/bug73.tex
+++ b/Build/source/texk/web2c/xetexdir/tests/bug73.tex
@@ -1,7 +1,16 @@
+% Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+% You may freely use, modify and/or distribute this file.
+%
+\ifx\fmtname\undefined
+  \input basic
+  \def\fmtname{basic}
+  \expandafter\dump
+\fi
+%==================
 \begingroup % Just there to minimize tracing output
   \tracingmacros=2
   \tracingonline=1
   \everyvbox{\relax} % or whatever, non-empty.
-  \vbox{}
+  \setbox0=\vbox{} % no pdf output
 \endgroup
 \end
diff --git a/Build/source/texk/web2c/xetexdir/xetex-bug73.test b/Build/source/texk/web2c/xetexdir/xetex-bug73.test
index e9142806832..cd0bee39613 100755
--- a/Build/source/texk/web2c/xetexdir/xetex-bug73.test
+++ b/Build/source/texk/web2c/xetexdir/xetex-bug73.test
@@ -4,23 +4,22 @@
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea
-TFMFONTS="$srcdir/tests;$srcdir/data"
-T1FONTS="$srcdir/tests;$srcdir/data"
-TEXFONTMAPS="$srcdir/tests;$srcdir/data"
-DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data"
-TEXPICTS=$srcdir/tests
-export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS
-
-failed=
-
-echo "*** xetex bug73" && echo \
-	&& ./xetex $srcdir/tests/bug73 \
-	&& diff $srcdir/tests/bug73.log <(tail -n+2 bug73.log)
-	&& echo && echo "xetex-bug73 tests OK" && echo \
-	|| failed="$failed xetex-bug73"
-
-test -z "$failed" && exit 0
-echo
-echo "failed tests:$failed"
-exit 1
+TEXINPUTS=.:$srcdir/tests
+TEXFORMATS=.
+
+export TEXMFCNF TEXINPUTS TEXFORMATS
+
+# get same filename in log
+rm -f bug73.tex
+$LN_S $srcdir/xetexdir/tests/bug73.tex .
+
+#exit 77
+
+./xetex -ini bug73 || exit 1
+
+./xetex -fmt=bug73 bug73 || exit 1
+
+tail -n+2 bug73.log >bug73.out
+
+diff $srcdir/xetexdir/tests/bug73.log bug73.out || exit 1