l3build (2nov19)

git-svn-id: svn://tug.org/texlive/trunk@52619 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 26 insertions, 11 deletions

diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index e2cdd655bf8..ea550327eb1 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -215,12 +215,14 @@ local function normalize_log(content,engine,errlevels)
     if match(line, "^> \\box%d+=$") or match(line, "^> \\box%d+=(void)$") then
       line = gsub(line, "%d+=", "...=")
     end
-    -- Remove 'normal' direction information on boxes with (u)pTeX
-    line = gsub(line, ",? yoko direction,?", "")
-    line = gsub(line, ",? yoko%(math%) direction,?", "")
-    -- Remove '\displace 0.0' lines in (u)pTeX
-    if match(line,"^%.*\\displace 0%.0$") then
-      return ""
+    if not match(stdengine,"^e?u?ptex$") then
+      -- Remove 'normal' direction information on boxes with (u)pTeX
+      line = gsub(line, ",? yoko direction,?", "")
+      line = gsub(line, ",? yoko%(math%) direction,?", "")
+      -- Remove '\displace 0.0' lines in (u)pTeX
+      if match(line,"^%.*\\displace 0%.0$") then
+        return ""
+       end
      end
      -- Remove the \special line that in DVI mode keeps PDFs comparable
     if match(line, "^%.*\\special%{pdf: docinfo << /Creator") then
@@ -249,6 +251,9 @@ local function normalize_log(content,engine,errlevels)
     line = gsub(line, "save cache:", "load cache:")
     -- A tidy-up to keep LuaTeX and other engines in sync
     line = gsub(line, utf8_char(127), "^^?")
+    -- Remove lua data reference ids
+    line = gsub(line, "<lua data reference [0-9]+>",
+                      "<lua data reference ...>")
     -- Unicode engines display chars in the upper half of the 8-bit range:
     -- tidy up to match pdfTeX if an ASCII engine is in use
     if next(asciiengines) then
@@ -749,7 +754,7 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
         .. setup(lvtfile)
         .. (hide and (" > " .. os_null) or "")
         .. os_concat ..
-      runtest_tasks(jobname(lvtfile))
+      runtest_tasks(jobname(lvtfile),i)
     )
     -- Break the loop if the result is stable
     if breakout and i < checkruns then
@@ -796,7 +801,7 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
 end
 
 -- A hook to allow additional tasks to run for the tests
-runtest_tasks = runtest_tasks or function(name)
+runtest_tasks = runtest_tasks or function(name,run)
   return ""
 end
 
@@ -958,6 +963,10 @@ end
 function save(names)
   checkinit()
   local engines = options["engine"] or {stdengine}
+  if names == nil then
+    print("Arguments are required for the save command")
+    return 1
+  end
   for _,name in pairs(names) do
     if testexists(name) then
       for _,engine in pairs(engines) do
@@ -989,7 +998,7 @@ function save(names)
         .. lveext .. " file of the same name")
       return 1
     else
-      print('Test "'.. name .. '"not found')
+      print('Test "' .. name .. '" not found')
       return 1
     end
   end
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index d9f4fe23f8e..48f3ab99d4f 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -2,7 +2,7 @@
 
 --[[
 
-File l3build.lua Copyright (C) 2014-2018 The LaTeX3 Project
+File l3build.lua Copyright (C) 2014-2019 The LaTeX3 Project
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -25,7 +25,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2019-10-02"
+release_date = "2019-11-01"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
@@ -177,8 +177,14 @@ if #checkconfigs == 1 and
    (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then
    local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua"
    if fileexists(config) then
+     local savedtestfiledir = testfiledir
      dofile(config)
      testdir = testdir .. "-" .. checkconfigs[1]
+     -- Reset testsuppdir if required
+     if savedtestfiledir ~= testfiledir and
+       testsuppdir == savedtestfiledir .. "/support" then
+       testsuppdir = testfiledir .. "/support"
+     end
    else
      print("Error: Cannot find configuration " ..  checkconfigs[1])
      exit(1)