[latex3-commits] [git/LaTeX3-latex3-l3build] master: Simplfy handling of LuaTeX-like engines (be6ffec)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/be6ffecefc26e4754358b8d176dda7e14c7b31c7

>---------------------------------------------------------------

commit be6ffecefc26e4754358b8d176dda7e14c7b31c7
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Feb 6 11:08:46 2019 +0000

    Simplfy handling of LuaTeX-like engines
    
    Rather than try to coerce them to be 'the same', simply
    accept that each is different. Means that they will need
    their own `.tlg` files, but probably that's OK.


>---------------------------------------------------------------

be6ffecefc26e4754358b8d176dda7e14c7b31c7
 l3build-check.lua |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/l3build-check.lua b/l3build-check.lua
index d011fe1..a04499c 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -552,7 +552,7 @@ function runcheck(name, hide)
   end
   local errorlevel = 0
   for _,engine in pairs(checkengines) do
-    local binary = engine
+    local enginename = engine
     -- Allow for luatex == luajittex for .tlg/.tpf purposes
     if match(engine,"^lua") then
       engine = "luatex"
@@ -560,9 +560,9 @@ function runcheck(name, hide)
     setup_check(name,engine)
     local errlevel = 0
     if fileexists(testfiledir .. "/" .. name .. pvtext) then
-      errlevel = check_and_diff(pvtext,engine,binary,compare_pdf,true)
+      errlevel = check_and_diff(pvtext,engine,enginename,compare_pdf,true)
     else
-      errlevel = check_and_diff(lvtext,engine,binary,compare_tlg)
+      errlevel = check_and_diff(lvtext,engine,enginename,compare_tlg)
     end
     if errlevel ~= 0 and options["halt-on-error"] then
       return 1
@@ -610,9 +610,9 @@ function setup_check(name, engine)
   end
 end
 
-function compare_pdf(name,engine,binary,cleanup)
+function compare_pdf(name,engine,enginename,cleanup)
   local testname = name .. "." .. engine
-  local difffile = testdir .. "/" .. name .. "." .. binary
+  local difffile = testdir .. "/" .. name .. "." .. enginename
     .. pdfext .. os_diffext
   local pdffile  = testdir .. "/" .. testname .. pdfext
   local tpffile  = locate({testdir}, {testname .. tpfext, name .. tpfext})
@@ -627,10 +627,10 @@ function compare_pdf(name,engine,binary,cleanup)
   return errorlevel
 end
 
-function compare_tlg(name,engine,binary,cleanup)
+function compare_tlg(name,engine,enginename,cleanup)
   local errorlevel
   local testname = name .. "." .. engine
-  local difffile = testdir .. "/" .. name .. "." .. binary .. os_diffext
+  local difffile = testdir .. "/" .. name .. "." .. enginename .. os_diffext
   local logfile  = testdir .. "/" .. testname .. logext
   local tlgfile  = locate({testdir}, {testname .. tlgext, name .. tlgext})
   if not tlgfile then
@@ -745,12 +745,12 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
     if breakout and i < checkruns then
       if pdfmode then
         rewrite(pdffile,npffile,normalize_pdf)
-        if compare_pdf(name,engine,binary,true) == 0 then
+        if compare_pdf(name,engine,true) == 0 then
           break
         end
       else
         rewrite(logfile,newfile,normalize_log,engine,errlevels)
-        if compare_tlg(name,engine,binary,true) == 0 then
+        if compare_tlg(name,engine,true) == 0 then
           break
         end
       end