diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-07-15 09:39:37 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-07-15 09:39:37 +0000 |
commit | e8b6183a1df246ebab704b4bc737a10fe08051da (patch) | |
tree | 79b249d0f9f31dc1d7796e1c2b949167162cfb56 /Build/source/texk/web2c/xetexdir | |
parent | 376082647d10be8cb6f417b0554c2ebf38cfb2fe (diff) |
XeTeX: Fix xetex-bug73.test
git-svn-id: svn://tug.org/texlive/trunk@34618 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/am/xetex.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/tests/bug73.log | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/tests/bug73.tex | 11 | ||||
-rwxr-xr-x | Build/source/texk/web2c/xetexdir/xetex-bug73.test | 37 |
5 files changed, 43 insertions, 25 deletions
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 |