l3build (9nov18)

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

2 files changed, 6 insertions, 4 deletions

diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 416bfb4c994..837b6356cbf 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -156,8 +156,9 @@ local function normalize_log(content,engine,errlevels)
         line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..")
         line = gsub(line,"v%d+%.?%d?%d?%w?","v...")
     end
-    -- Deal with the fact that "(.aux)" may have still a leading space
-    line = gsub(line, "^ %(%.aux%)", "(.aux)")
+    -- Deal with leading spaces for file and page number lines
+    line = gsub(line,"^ *%[(%d)","[%1")
+    line = gsub(line,"^ *%(","(")
     -- Zap .fd lines: drop the first part, and skip to the end
     if match(line, "^ *%([%.%/%w]+%.fd[^%)]*$") then
       return "","",true
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index ee17fe2ab84..e40b8e6da74 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2018-10-30"
+release_date = "2018-11-08"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
@@ -154,8 +154,9 @@ if options["target"] == "check" then
       for _,config in ipairs(failed) do
         print("Failed tests for configuration " .. config .. ":")
         print("\n  Check failed with difference files")
+        local testdir = testdir
         if config ~= "build" then
-          local testdir = testdir .. "-" .. config
+          testdir = testdir .. "-" .. config
         end
         for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do
           print("  - " .. testdir .. "/" .. i)