diff options
author | Norbert Preining <norbert@preining.info> | 2023-02-17 03:02:19 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-02-17 03:02:19 +0000 |
commit | cb7cbc1f98cedde266389c64619b6dbfaec14f87 (patch) | |
tree | d42289d8d7637a893a448e58de7e1b094bc13af0 /macros/latex/contrib/l3build/l3build-check.lua | |
parent | 024d47cb1c4e5ba541f3865b69168bef20f2bfce (diff) |
CTAN sync 202302170302
Diffstat (limited to 'macros/latex/contrib/l3build/l3build-check.lua')
-rw-r--r-- | macros/latex/contrib/l3build/l3build-check.lua | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 7b3191aa20..d6d68086bc 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -1,6 +1,6 @@ --[[ -File l3build-check.lua Copyright (C) 2018-2022 The LaTeX Project +File l3build-check.lua Copyright (C) 2018-2023 The LaTeX Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -126,8 +126,8 @@ local function normalize_log(content,engine,errlevels) -- Zap line numbers from \show, \showbox, \box_show and the like: -- do this before wrapping lines line = gsub(line, "^l%.%d+ ", "l. ...") - -- Also from lua stack traces. - line = gsub(line, "lua:%d+: in function", "lua:...: in function") + -- Also from Lua stack traces + line = gsub(line, "lua:%d+:", "lua:...:") -- Allow for wrapped lines: preserve the content and wrap -- Skip lines that have an explicit marker for truncation if len(line) == maxprintline and @@ -778,8 +778,7 @@ function runtest(name, engine, hide, ext, test_type, breakout) rmfile(testdir,name .. logext) local errlevels = {} for i = 1, checkruns do - errlevels[i] = run( - testdir, + errlevels[i] = runcmd( -- No use of localdir here as the files get copied to testdir: -- avoids any paths in the logs os_setenv .. " TEXINPUTS=." .. localtexmf() @@ -788,13 +787,6 @@ function runtest(name, engine, hide, ext, test_type, breakout) os_setenv .. " LUAINPUTS=." .. localtexmf() .. (checksearch and os_pathsep or "") .. os_concat .. - -- Avoid spurious output from (u)pTeX - os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0" - .. os_concat .. - -- Allow for local texmf files - os_setenv .. " TEXMFCNF=." .. os_pathsep - .. os_concat .. - set_epoch_cmd(epoch, forcecheckepoch) .. -- Ensure lines are of a known length os_setenv .. " max_print_line=" .. maxprintline .. os_concat .. @@ -803,7 +795,8 @@ function runtest(name, engine, hide, ext, test_type, breakout) .. setup(lvtfile) .. (hide and (" > " .. os_null) or "") .. os_concat .. - runtest_tasks(jobname(lvtfile),i) + runtest_tasks(jobname(lvtfile),i), + testdir ) -- Break the loop if the result is stable if breakout and i < checkruns then |