[latex3-commits] [l3svn] r6115 - l3build: Allow for LuaJITTeX
noreply at latex-project.org
noreply at latex-project.org
Tue Sep 29 14:06:31 CEST 2015
Author: joseph
Date: 2015-09-29 14:06:31 +0200 (Tue, 29 Sep 2015)
New Revision: 6115
Modified:
trunk/l3build/l3build.lua
Log:
l3build: Allow for LuaJITTeX
This treats LuaJITTeX as equivalent to LuaTeX from our point
of view: they share test files, etc.
Modified: trunk/l3build/l3build.lua
===================================================================
--- trunk/l3build/l3build.lua 2015-09-28 21:32:37 UTC (rev 6114)
+++ trunk/l3build/l3build.lua 2015-09-29 12:06:31 UTC (rev 6115)
@@ -796,7 +796,7 @@
local kpse = require("kpse")
kpse.set_program_name(engine)
local maxprintline = tonumber(kpse.expand_var("$max_print_line"))
- if engine == "luatex" then
+ if string.match(engine, "^lua?j?i?t?tex$") then
maxprintline = maxprintline + 1 -- Deal with an out-by-one error
end
local lastline = ""
@@ -1009,9 +1009,15 @@
end
local errorlevel = 0
for _,i in ipairs(checkengines) do
- local testname = name .. "." .. i
+ -- Allow for luatex == luajitex 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,9 @@
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 not string.match(stdengine, "^luaj?i?t?tex$") then
local luatlgfile = testdir .. "/" .. name .. ".luatex" .. tlgext
if os_windows then
luatlgfile = unix_to_win(luatlgfile)
More information about the latex3-commits
mailing list