diff options
author | Karl Berry <karl@freefriends.org> | 2018-10-25 21:34:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-10-25 21:34:47 +0000 |
commit | 02aa0c181c36eb53c436478eeb878a070972ac16 (patch) | |
tree | e6803181aa2bf1a9bbe4ccda4841b4f6d9b1e31a /Master/texmf-dist/scripts/l3build/l3build-check.lua | |
parent | 56ff75d2dc5bee2624945e8dd43945f1670e040d (diff) |
l3build (25oct18)
git-svn-id: svn://tug.org/texlive/trunk@48991 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 | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 556f326cd70..416bfb4c994 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 engine == "luatex" or engine == "luajittex" then + if match(engine,"^lua") then maxprintline = maxprintline + 1 -- Deal with an out-by-one error end local function killcheck(line) @@ -553,7 +553,7 @@ function runcheck(name, hide) for _,engine in pairs(checkengines) do local enginename = engine -- Allow for luatex == luajittex for .tlg/.tpf purposes - if engine == "luajittex" then + if match(engine,"^lua") then engine = "luatex" end setup_check(name,engine) @@ -638,8 +638,7 @@ function compare_tlg(name, engine,cleanup) -- LuaTeX-specific .tlg file and the default engine is not LuaTeX if engine == "luatex" and not match(tlgfile, "%.luatex" .. "%" .. tlgext) - and stdengine ~= "luatex" - and stdengine ~= "luajittex" + and not match(stdengine,"^lua") then local lualogfile = logfile if cleanup then @@ -671,25 +670,20 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) cp(lvtfile, fileexists(testfiledir .. "/" .. lvtfile) and testfiledir or unpackdir, testdir) local engine = engine or stdengine - -- Set up the format file name if it's one ending "...tex" local realengine = engine local format = "" - if - match(checkformat, "tex$") and - not match(engine, checkformat) then - format = " -fmt=" .. gsub(engine, "(.*)tex$", "%1") .. checkformat - end - -- Special casing for e-LaTeX format - if - match(checkformat, "^latex$") and - match(engine, "^etex$") then - format = " -fmt=latex" - end - -- Special casing for (u)pTeX LaTeX formats - if - match(checkformat, "^latex$") and - match(engine, "^u?ptex$") then - realengine = "e" .. engine + if checkformat == "latex" then + -- Special case for e-LaTeX format + if engine == "etex" then + format = " -fmt=latex" + -- Use "...latex" formats for other engines + elseif not match(engine,"latex") then + format = " -fmt=" .. gsub(engine,"tex","latex") + end + -- Special case for (u)pTeX LaTeX + if match(engine,"^u?ptex$") then + realengine = "e" .. engine + end end -- Special casing for XeTeX engine local checkopts = checkopts @@ -703,7 +697,7 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) if match(checkformat, "^context$") then format = "" function setup(file) return ' "' .. file .. '" ' end - if engine == "luatex" or engine == "luajittex" then + if match(engine,"^lua") then realengine = "context" elseif engine == "pdftex" then realengine = "texexec" |