7 files changed, 69 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index ea448e4e13e..fa78f2e23c5 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftosrc.test: Shell script for a new test.
+	* tests/test-{13,15}.{pdf,xref} (new): Test input and expected
+	output (from Hartmut Henkel <hartmut_henkel@gmx,de>).
+	* am/pdftosrc.am: Adjust.
+
 2011-07-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pdftoepdf.cc, pdftosrc.cc: #include <assert.h> for both xpdf
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
index c29521c4e93..1598812a519 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
@@ -1,6 +1,6 @@
 ## texk/web2c/pdftexdir/am/pdftosrc.am: Makefile fragment for pdftosrc.
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## pdftosrc
@@ -24,3 +24,17 @@ pdftosrc_DEPENDENCIES = $(pdftex_dependencies)
 
 $(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND)
 
+## Tests
+##
+pdftosrc_tests = pdftexdir/pdftosrc.test
+EXTRA_DIST += $(pdftosrc_tests)
+
+## pdftexdir/pdftosrc.test
+EXTRA_DIST += pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
+	pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref
+DISTCLEANFILES += test-13.pdf test-13.xref test-15.pdf test-15.xref
+
+if PDFTEX
+TESTS += $(pdftosrc_tests)
+endif PDFTEX
+
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.test b/Build/source/texk/web2c/pdftexdir/pdftosrc.test
new file mode 100755
index 00000000000..503c561015c
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.test
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+src=$srcdir/pdftexdir/tests
+
+rm -rf test-13.* test-15.*
+
+cp $src/test-13.pdf .
+./pdftosrc test-13.pdf -1 \
+	&& diff test-13.xref $src/test-13.xref \
+	|| exit 1
+
+cp $src/test-15.pdf .
+./pdftosrc test-15.pdf -1 \
+	&& diff test-15.xref $src/test-15.xref \
+	|| exit 1
+
diff --git a/Build/source/texk/web2c/pdftexdir/tests/test-13.pdf b/Build/source/texk/web2c/pdftexdir/tests/test-13.pdf
new file mode 100644
index 00000000000..8255d131c61
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/tests/test-13.pdf
diff --git a/Build/source/texk/web2c/pdftexdir/tests/test-13.xref b/Build/source/texk/web2c/pdftexdir/tests/test-13.xref
new file mode 100644
index 00000000000..81cafae715b
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/tests/test-13.xref
@@ -0,0 +1,13 @@
+xref
+0 11
+0000000000 65535 f
+0000000916 00000 n
+0000000813 00000 n
+0000000015 00000 n
+0000017227 00000 n
+0000017353 00000 n
+0000000973 00000 n
+0000001338 00000 n
+0000016948 00000 n
+0000017404 00000 n
+0000017449 00000 n
diff --git a/Build/source/texk/web2c/pdftexdir/tests/test-15.pdf b/Build/source/texk/web2c/pdftexdir/tests/test-15.pdf
new file mode 100644
index 00000000000..e5d1feb715a
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/tests/test-15.pdf
diff --git a/Build/source/texk/web2c/pdftexdir/tests/test-15.xref b/Build/source/texk/web2c/pdftexdir/tests/test-15.xref
new file mode 100644
index 00000000000..1e5ced2b8c6
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/tests/test-15.xref
@@ -0,0 +1,15 @@
+xref
+0 13
+0000000000 00255 f
+0000016640 00000 n
+0000016552 00000 n
+0000000015 00000 n
+0000017296 00000 n
+0000017407 00000 n
+0000016423 00000 n
+0000016682 00000 n
+0000000813 00000 n
+0000017032 00000 n
+0000017443 00000 n
+0000017473 00000 n
+0000017155 00000 n