5 files changed, 77 insertions, 5 deletions
diff --git a/Build/tests/largefile/README b/Build/tests/largefile/README
index f78c6b46e21..9c98b6b443a 100644
--- a/Build/tests/largefile/README
+++ b/Build/tests/largefile/README
@@ -20,8 +20,13 @@ to verify that the TeX engine (TeX, pdfTeX, Aleph, etc.) detects when a DVI
 file would be 2GB or more.
 
 Run
-  PATH_TO_largepdf.test PATH_TO_PDFTEX_ENGINE
-to verify that pdfTeX can create PDF files with 2GB or more (based on
+  PATH_TO_largepdf.test PATH_TO_PDFTEX_OR_LUATEX_ENGINE
+to verify that pdfTeX and LuaTeX can create PDF files with 2.8GB (based on
+lfs.tgz from Martin Schr\"oder <martin@oneiros.de>, compare testlfs-martin/*).
+
+Run
+  PATH_TO_hugepdf.test PATH_TO_PDFTEX_OR_LUATEX_ENGINE
+to verify that pdfTeX and LuaTeX can create PDF files with 4.6GB (based on
 lfs.tgz from Martin Schr\"oder <martin@oneiros.de>, compare testlfs-martin/*).
 
 Run
diff --git a/Build/tests/largefile/hugepdf.test b/Build/tests/largefile/hugepdf.test
new file mode 100755
index 00000000000..6b632e62230
--- /dev/null
+++ b/Build/tests/largefile/hugepdf.test
@@ -0,0 +1,33 @@
+#! /bin/sh
+#
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+usage () {
+  echo "usage: $0 PDFTEX-ENGINE" >&2
+  echo "	test that pdfTeX can create PDF files with >2GB" >&2
+  echo "" >&2
+  echo "	where PDFTEX-ENGINE is the path to pdfTeX (or perhaps luaTeX)" >&2
+  exit 1
+}
+
+test -n "$1" && test -x "$1" || usage
+
+dir=`dirname "$0"`
+TEXMFCNF=`cd "$dir" && pwd`
+export TEXMFCNF
+
+PDFTEX=`dirname "$1"`/`basename "$1"`
+
+echo testing "'$PDFTEX'"
+echo
+"$PDFTEX" -ini hugepdf && mv -f hugepdf.{,ini}log && "$PDFTEX" -fmt=hugepdf hugepdf
+echo
+
+if grep '^Output written.*(5000 pages,' hugepdf.log >/dev/null; then
+  ls -lh hugepdf.pdf
+  echo PASS: hugepdf.test
+  rm -f hugepdf.fmt # hugepdf.log hugepdf.pdf
+else
+  echo FAIL: hugepdf.test
+fi
diff --git a/Build/tests/largefile/hugepdf.tex b/Build/tests/largefile/hugepdf.tex
new file mode 100644
index 00000000000..f0b3e3d6213
--- /dev/null
+++ b/Build/tests/largefile/hugepdf.tex
@@ -0,0 +1,28 @@
+% Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+% You may freely use, modify and/or distribute this file.
+%
+\ifx\fmtname\undefined
+  \input basic
+  \def\fmtname{basic}
+  \ifx\directlua\undefined\else
+    \begingroup
+      \message{Activating LuaTeX primitives}
+      \directlua{tex.enableprimitives('',tex.extraprimitives())}
+    \endgroup
+  \fi
+  \expandafter\dump
+\fi
+%================== 3gb.tex
+\pdfoutput=1
+\pdfcompresslevel=0
+
+\topskip0pt
+\newcount\n
+\loop
+	\pdfximage width \hsize height \vsize {poles.png}
+	\hbox{\pdfrefximage\pdflastximage}
+	\eject
+	\advance\n by1
+	\ifnum\n<5000
+\repeat
+\bye
diff --git a/Build/tests/largefile/largepdf.test b/Build/tests/largefile/largepdf.test
index 25d59c8a6bf..2f2c40b7103 100755
--- a/Build/tests/largefile/largepdf.test
+++ b/Build/tests/largefile/largepdf.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 usage () {
@@ -21,7 +21,7 @@ PDFTEX=`dirname "$1"`/`basename "$1"`
 
 echo testing "'$PDFTEX'"
 echo
-"$PDFTEX" -ini largepdf && "$PDFTEX" -fmt=largepdf largepdf
+"$PDFTEX" -ini largepdf && mv -f largepdf.{,ini}log && "$PDFTEX" -fmt=largepdf largepdf
 echo
 
 if grep '^Output written.*(3000 pages,' largepdf.log >/dev/null; then
diff --git a/Build/tests/largefile/largepdf.tex b/Build/tests/largefile/largepdf.tex
index e268b52545a..b9b9d1164fd 100644
--- a/Build/tests/largefile/largepdf.tex
+++ b/Build/tests/largefile/largepdf.tex
@@ -1,9 +1,15 @@
-% Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+% Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
 % You may freely use, modify and/or distribute this file.
 %
 \ifx\fmtname\undefined
   \input basic
   \def\fmtname{basic}
+  \ifx\directlua\undefined\else
+    \begingroup
+      \message{Activating LuaTeX primitives}
+      \directlua{tex.enableprimitives('',tex.extraprimitives())}
+    \endgroup
+  \fi
   \expandafter\dump
 \fi
 %================== 3gb.tex