From 6dc0ccac671319a03fa217782f7cbd746556c426 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 30 Jul 2015 07:48:50 +0000 Subject: texk/dvipdfm-x: Add tests for Ascii pTeX and TeX-XeT DVI extensions git-svn-id: svn://tug.org/texlive/trunk@38003 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 7 ++++++ Build/source/texk/dvipdfm-x/Makefile.am | 9 ++++---- Build/source/texk/dvipdfm-x/Makefile.in | 11 +++++----- Build/source/texk/dvipdfm-x/tests/ptex.dvi | Bin 0 -> 188 bytes Build/source/texk/dvipdfm-x/tests/reverse.dvi | Bin 0 -> 188 bytes Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test | 30 ++++++++++++++++++++++++++ Build/source/texk/dvipdfm-x/xdvipdfm-rev.test | 25 +++++++++++++++++++++ 7 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 Build/source/texk/dvipdfm-x/tests/ptex.dvi create mode 100644 Build/source/texk/dvipdfm-x/tests/reverse.dvi create mode 100755 Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test create mode 100755 Build/source/texk/dvipdfm-x/xdvipdfm-rev.test diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index e37025a2796..4db862df652 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,10 @@ +2015-07-30 Peter Breitenlohner + + * xdvipdfm-ptx.test: New shell script to test Ascii pTeX output. + * xdvipdfm-rev.test: New shell script to test TeX-XeT output. + * tests/ptex.dvi, tests/reverse.dvi: New test input data. + * Makefile.am: Add the new tests and input data. + 2015-07-29 Peter Breitenlohner * Makefile.am, ac/withenable.ac, configure.ac, dvipdfmx.c, diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index 40bf53ffed3..cf9cc495583 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -245,9 +245,9 @@ DISTCLEANFILES = config.force ## Tests ## TESTS = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test xdvipdfm-bkm.test xdvipdfm-psz.test -TESTS += xdvipdfm-res.test xdvipdfm-ttc.test +TESTS += xdvipdfm-ptx.test xdvipdfm-res.test xdvipdfm-rev.test xdvipdfm-ttc.test xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bb.log xdvipdfm-bkm.log xdvipdfm-psz.log \ - xdvipdfm-res.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT) + xdvipdfm-ptx.log xdvipdfm-res.log xdvipdfm-rev.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT) EXTRA_DIST = $(TESTS) ## Test Data EXTRA_DIST += tests/dvipdfmx.cfg tests/psfonts.map @@ -260,7 +260,8 @@ EXTRA_DIST += tests/image.pdf tests/picpdf.bb tests/picpdf.xbb 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/resrc.dvi tests/resrc.tex tests/ptex.dvi tests/reverse.dvi EXTRA_DIST += tests/xbmc.dvi tests/xbmc.tex tests/xbmc10.600pk tests/xbmc10.tfm EXTRA_DIST += tests/ttc.dvi tests/ttc.tex tests/test.ttc -DISTCLEANFILES += pic*.* image*.pdf annot*.pdf bookm*.pdf paper*.pdf resrc*.pdf xbmc*.pdf ttc*.pdf +DISTCLEANFILES += pic*.* image*.pdf annot*.pdf bookm*.pdf paper*.pdf resrc*.pdf +DISTCLEANFILES += xbmc*.pdf ttc*.pdf ptex*.pdf reverse.pdf diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index 2f517e01cb4..1d4fac84af0 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -780,10 +780,10 @@ dist_mapdata_DATA = data/cid-x.map cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx dist_cmapdata_DATA = data/EUC-UCS2 DISTCLEANFILES = config.force pic*.* image*.pdf annot*.pdf bookm*.pdf \ - paper*.pdf resrc*.pdf xbmc*.pdf ttc*.pdf + paper*.pdf resrc*.pdf xbmc*.pdf ttc*.pdf ptex*.pdf reverse.pdf TESTS = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test \ - xdvipdfm-bkm.test xdvipdfm-psz.test xdvipdfm-res.test \ - xdvipdfm-ttc.test + xdvipdfm-bkm.test xdvipdfm-psz.test xdvipdfm-ptx.test \ + xdvipdfm-res.test xdvipdfm-rev.test xdvipdfm-ttc.test EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \ tests/fullmap.dvi tests/fullmap.tex tests/image.bmp \ tests/picbmp.bb tests/picbmp.xbb tests/image.jp2 \ @@ -794,7 +794,8 @@ EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \ tests/image.tex tests/cmr10.pfb 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/resrc.dvi tests/resrc.tex tests/ptex.dvi \ + tests/reverse.dvi tests/xbmc.dvi tests/xbmc.tex \ tests/xbmc10.600pk tests/xbmc10.tfm tests/ttc.dvi \ tests/ttc.tex tests/test.ttc all: config.h @@ -1801,7 +1802,7 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(LIBPAPER_DEPE @ZLIB_RULE@ @LIBPAPER_RULE@ xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bb.log xdvipdfm-bkm.log xdvipdfm-psz.log \ - xdvipdfm-res.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT) + xdvipdfm-ptx.log xdvipdfm-res.log xdvipdfm-rev.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/dvipdfm-x/tests/ptex.dvi b/Build/source/texk/dvipdfm-x/tests/ptex.dvi new file mode 100644 index 00000000000..8774e670763 Binary files /dev/null and b/Build/source/texk/dvipdfm-x/tests/ptex.dvi differ diff --git a/Build/source/texk/dvipdfm-x/tests/reverse.dvi b/Build/source/texk/dvipdfm-x/tests/reverse.dvi new file mode 100644 index 00000000000..d32b2ae8da4 Binary files /dev/null and b/Build/source/texk/dvipdfm-x/tests/reverse.dvi differ diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test new file mode 100755 index 00000000000..133490feacd --- /dev/null +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ptx.test @@ -0,0 +1,30 @@ +#! /bin/sh + +# Copyright (C) 2015 Peter Breitenlohner +# 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 "*** xdvipdfmx -v -z0 -o ptex1.pdf ptex" && echo \ + && ./xdvipdfmx -v -z0 -o ptex1.pdf $srcdir/tests/ptex \ + && echo && echo "xdvipdfmx-ptex tests OK" && echo \ + || failed="$failed xdvipdfmx-ptex" + +echo "*** xdvipdfmx -v -z0 ptex2.pdf" && echo \ + && ./xdvipdfmx -v -z0 <$srcdir/tests/ptex.dvi >ptex2.pdf \ + && echo && echo "xdvipdfmx-ptex (stdin->stdout) tests OK" && echo \ + || failed="$failed xdvipdfmx-ptex (stdin->stdout)" + +test -z "$failed" && exit 0 +echo +echo "failed tests:$failed" +exit 1 + diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test b/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test new file mode 100755 index 00000000000..8216efc51be --- /dev/null +++ b/Build/source/texk/dvipdfm-x/xdvipdfm-rev.test @@ -0,0 +1,25 @@ +#! /bin/sh + +# Copyright (C) 2015 Peter Breitenlohner +# 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 "*** xdvipdfmx -v -z0 -o reverse.pdf reverse" && echo \ + && ./xdvipdfmx -v -z0 -o reverse.pdf $srcdir/tests/reverse \ + && echo && echo "xdvipdfmx-reverse tests OK" && echo \ + || failed="$failed xdvipdfmx-reverse" + +test -z "$failed" && exit 0 +echo +echo "failed tests:$failed" +exit 1 + -- cgit v1.2.3