summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-05 21:00:11 +0000
committerKarl Berry <karl@freefriends.org>2015-10-05 21:00:11 +0000
commit574a128b478f07856887f79f3b2e666e97ce9fed (patch)
treef7a7ff5c8122aad44c76fbfe823f9609d80aea65 /Master/texmf-dist/tex/latex
parent93e764a1ea9faa8e9cc236040bb41e3e060fd6c2 (diff)
l3build (5oct15)
git-svn-id: svn://tug.org/texlive/trunk@38563 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua23
-rw-r--r--Master/texmf-dist/tex/latex/l3build/regression-test.tex6
2 files changed, 20 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index 489819a709c..d1abc997109 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -17,8 +17,8 @@
--]]
-- Version information: should be identical to that in l3build.dtx
-release_date = "2015/09/24"
-release_ver = "6068"
+release_date = "2015/10/05"
+release_ver = "6172"
-- "module" is a deprecated function in Lua 5.2: as we want the name
-- for other purposes, and it should eventually be 'free', simply
@@ -796,7 +796,7 @@ function formatlog(logfile, newfile, engine)
local kpse = require("kpse")
kpse.set_program_name(engine)
local maxprintline = tonumber(kpse.expand_var("$max_print_line"))
- if engine == "luatex" then
+ if engine == "luatex" or engine == "luajittex" then
maxprintline = maxprintline + 1 -- Deal with an out-by-one error
end
local lastline = ""
@@ -1009,9 +1009,15 @@ function runcheck(name, hide)
end
local errorlevel = 0
for _,i in ipairs(checkengines) do
- local testname = name .. "." .. i
+ -- Allow for luatex == luajittex for .tlg purposes
+ local enginename = i
+ if i == "luajittex" then
+ enginename = "luatex"
+ newfile = testdir .. "/" .. name .. "." .. i .. logext
+ end
+ local testname = name .. "." .. enginename
local difffile = testdir .. "/" .. testname .. os_diffext
- local newfile = testdir .. "/" .. testname .. logext
+ local newfile = newfile or testdir .. "/" .. testname .. logext
-- Use engine-specific file if available
local tlgfile = locate(
{testfiledir, unpackdir},
@@ -1039,9 +1045,10 @@ function runcheck(name, hide)
local errlevel
-- Do additional log formatting if the engine is LuaTeX, there is no
-- LuaTeX-specific .tlg file and the default engine is not LuaTeX
- if i == "luatex"
- and tlgfile ~= name .. "." .. i .. tlgext
- and stdengine ~= "luatex" then
+ if enginename == "luatex"
+ and tlgfile ~= name .. ".luatex" .. tlgext
+ and stdengine ~= "luatex"
+ and stdengine ~= "luajittex" then
local luatlgfile = testdir .. "/" .. name .. ".luatex" .. tlgext
if os_windows then
luatlgfile = unix_to_win(luatlgfile)
diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
index 6654067138f..acebab12439 100644
--- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex
+++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
@@ -116,7 +116,11 @@
\fi
\LONGTYPEOUT{END-TEST-LOG}\@@@end
}
-\let\@@end\END
+\ifx\@@end\@undefined
+ \let\end\END
+\else
+ \let\@@end\END
+\fi
\def\FORMAT#1{\LONGTYPEOUT{Format: #1}%
\def\@tempa{#1}\ifx\@tempa\@EJ\else
\OMIT\TYPE{WARNING: Declared format #1,^^JActual format \@EJ}\TIMO\fi}