diff options
author | Karl Berry <karl@freefriends.org> | 2019-06-26 20:53:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-06-26 20:53:24 +0000 |
commit | 00ce1cef09943d8a78c8093e8c207db224596d58 (patch) | |
tree | 71efb67892f173bcc17c9f3c7c2936cbc1be7dc1 /Master/texmf-dist/scripts/l3build/l3build-check.lua | |
parent | 5a828e3f77f32820a24b0d207e8e7e6ef8e2d188 (diff) |
l3build (26jun19)
git-svn-id: svn://tug.org/texlive/trunk@51478 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build/l3build-check.lua')
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-check.lua | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 301c0df1853..38e7f88a352 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -98,7 +98,7 @@ end -- the 'business' part from the tests and removes system-dependent stuff local function normalize_log(content,engine,errlevels) local maxprintline = maxprintline - if match(engine,"^lua") then + if match(engine,"^lua") or match(engine,"^harf") then maxprintline = maxprintline + 1 -- Deal with an out-by-one error end local function killcheck(line) @@ -123,7 +123,9 @@ local function normalize_log(content,engine,errlevels) -- 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") + for str,_ in pairs({"field","function","upvalue"}) do + line = gsub(line, "lua:%d+: in " .. str, "lua:...: in " .. str) + end -- Allow for wrapped lines: preserve the content and wrap -- Skip lines that have an explicit marker for truncation if len(line) == maxprintline and @@ -637,7 +639,7 @@ function compare_tlg(name,engine,cleanup) end -- Do additional log formatting if the engine is LuaTeX, there is no -- LuaTeX-specific .tlg file and the default engine is not LuaTeX - if match(engine,"^lua") + if match(engine,"^lua") or match(engine,"harf") and not match(tlgfile, "%.luatex" .. "%" .. tlgext) and not match(stdengine,"^lua") then |