summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3build/l3build-check.lua
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-12-10 03:01:42 +0000
committerNorbert Preining <norbert@preining.info>2021-12-10 03:01:42 +0000
commite8ddf481fa0d453faba1a05623b2d4cba9b6404e (patch)
treedb96e35cfa187f7ab90ec266a63b577db8a5095d /macros/latex/contrib/l3build/l3build-check.lua
parent48aad54f9d8faf7776248c653b2a7da9bb2ffa95 (diff)
CTAN sync 202112100301
Diffstat (limited to 'macros/latex/contrib/l3build/l3build-check.lua')
-rw-r--r--macros/latex/contrib/l3build/l3build-check.lua15
1 files changed, 7 insertions, 8 deletions
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua
index 249b22164a..65ac222271 100644
--- a/macros/latex/contrib/l3build/l3build-check.lua
+++ b/macros/latex/contrib/l3build/l3build-check.lua
@@ -719,6 +719,7 @@ function runtest(name, engine, hide, ext, test_type, breakout)
cp(lvtfile, fileexists(testfiledir .. "/" .. lvtfile)
and testfiledir or unpackdir, testdir)
local checkopts = checkopts
+ local tokens = ""
engine = engine or stdengine
local binary = engine
local format = gsub(engine,"tex$",checkformat)
@@ -730,6 +731,8 @@ function runtest(name, engine, hide, ext, test_type, breakout)
binary = engine_info.binary or binary
format = engine_info.format or format
checkopts = engine_info.options or checkopts
+ tokens = engine_info.tokens and (' "' .. engine_info.tokens .. '" ')
+ or tokens
end
end
-- Finalise format string
@@ -742,10 +745,10 @@ function runtest(name, engine, hide, ext, test_type, breakout)
end
-- Special casing for ConTeXt
local function setup(file)
- return " -jobname=" .. name .. " " .. ' "\\input ' .. file .. '" '
+ return " -jobname=" .. name .. tokens .. ' "\\input ' .. file .. '" '
end
if match(checkformat,"^context$") then
- function setup(file) return ' "' .. file .. '" ' end
+ function setup(file) return tokens .. ' "' .. file .. '" ' end
end
local basename = testdir .. "/" .. name
local gen_file = basename .. test_type.generated
@@ -764,19 +767,15 @@ function runtest(name, engine, hide, ext, test_type, breakout)
-- Ensure there is no stray .log file
rmfile(testdir,name .. logext)
local errlevels = {}
- local localtexmf = ""
- if texmfdir and texmfdir ~= "" and direxists(texmfdir) then
- localtexmf = os_pathsep .. abspath(texmfdir) .. "//"
- end
for i = 1, checkruns do
errlevels[i] = run(
testdir,
-- No use of localdir here as the files get copied to testdir:
-- avoids any paths in the logs
- os_setenv .. " TEXINPUTS=." .. localtexmf
+ os_setenv .. " TEXINPUTS=." .. localtexmf()
.. (checksearch and os_pathsep or "")
.. os_concat ..
- os_setenv .. " LUAINPUTS=." .. localtexmf
+ os_setenv .. " LUAINPUTS=." .. localtexmf()
.. (checksearch and os_pathsep or "")
.. os_concat ..
-- Avoid spurious output from (u)pTeX