summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog7
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am9
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in11
-rw-r--r--Build/source/texk/dvipdfm-x/tests/ptex.dvibin0 -> 188 bytes
-rw-r--r--Build/source/texk/dvipdfm-x/tests/reverse.dvibin0 -> 188 bytes
-rwxr-xr-xBuild/source/texk/dvipdfm-x/xdvipdfm-ptx.test30
-rwxr-xr-xBuild/source/texk/dvipdfm-x/xdvipdfm-rev.test25
7 files changed, 73 insertions, 9 deletions
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 <peb@mppmu.mpg.de>
+
+ * 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 <peb@mppmu.mpg.de>
* 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
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/ptex.dvi
Binary files 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
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/reverse.dvi
Binary files 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 <tex-live@tug.org>
+# 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 <ptex.dvi >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 <tex-live@tug.org>
+# 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
+