summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-21 21:07:27 +0000
committerKarl Berry <karl@freefriends.org>2018-09-21 21:07:27 +0000
commit32c5c2edc1e107fb665e93ab4d592447387d49dd (patch)
tree559380f956bd5a7c1726a5883f34282a7bdec553 /Master/texmf-dist/scripts/l3build
parenta7130f1e9343b9d655100fef8c49e689549cbfe2 (diff)
l3build (21sep18)
git-svn-id: svn://tug.org/texlive/trunk@48724 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua40
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-clean.lua2
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
3 files changed, 26 insertions, 18 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index de01514d5a9..e59f6ca7e54 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -102,23 +102,23 @@ local function normalize_log(content,engine,errlevels)
maxprintline = maxprintline + 1 -- Deal with an out-by-one error
end
local function killcheck(line)
- -- Skip lines containing file dates
- if match(line, "[^<]%d%d%d%d/%d%d/%d%d")
- or match(line, "[^<]%d%d%d%d%-%d%d%-%d%d") then
- return true
- elseif
-- Skip \openin/\openout lines in web2c 7.x
-- As Lua doesn't allow "(in|out)", a slightly complex approach:
-- do a substitution to check the line is exactly what is required!
- match(
- gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = "
- ) then
- return true
- end
+ if match(gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = ") then
+ return true
+ end
return false
end
-- Substitutions to remove some non-useful changes
- local function normalize(line, lastline)
+ local function normalize(line,lastline,drop_fd)
+ if drop_fd then
+ if match(line," *%)") then
+ return "",""
+ else
+ return "","",true
+ end
+ end
-- Zap line numbers from \show, \showbox, \box_show and the like:
-- do this before wrapping lines
line = gsub(line, "^l%.%d+ ", "l. ...")
@@ -151,12 +151,16 @@ local function normalize_log(content,engine,errlevels)
line = gsub(line, pattern, "../%1")
end
end
+ -- Deal with dates
+ if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then
+ 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)")
- -- Merge all of .fd data into one line so will be removed later
+ -- Zap .fd lines: drop the first part, and skip to the end
if match(line, "^ *%([%.%/%w]+%.fd[^%)]*$") then
- lastline = (lastline or "") .. line
- return "", (lastline or "") .. line
+ return "","",true
end
-- TeX90/XeTeX knows only the smaller set of dimension units
line = gsub(line,
@@ -250,6 +254,7 @@ local function normalize_log(content,engine,errlevels)
return line, lastline
end
local lastline = ""
+ local drop_fd = false
local new_content = ""
local prestart = true
local skipping = false
@@ -264,7 +269,7 @@ local function normalize_log(content,engine,errlevels)
elseif match(line, "^%)?TIMO$") then
skipping = false
elseif not prestart and not skipping then
- line, lastline = normalize(line, lastline)
+ line, lastline, drop_fd = normalize(line, lastline,drop_fd)
if not match(line, "^ *$") and not killcheck(line) then
new_content = new_content .. line .. os_newline
end
@@ -526,7 +531,10 @@ end
-- Run one test which may have multiple engine-dependent comparisons
-- Should create a difference file for each failed test
function runcheck(name, hide)
- if not testexists(name) then return 1 end
+ if not testexists(name) then
+ print("Failed to find input for test " .. name)
+ return 1
+ end
local checkengines = checkengines
if options["engine"] then
checkengines = options["engine"]
diff --git a/Master/texmf-dist/scripts/l3build/l3build-clean.lua b/Master/texmf-dist/scripts/l3build/l3build-clean.lua
index 3fd8396c9ce..01927a71d04 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-clean.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-clean.lua
@@ -45,7 +45,7 @@ end
function bundleclean()
local errorlevel = call(modules, "clean")
for _,i in ipairs(cleanfiles) do
- errorlevel = rm(maindir, i) + errorlevel
+ errorlevel = rm(currentdir, i) + errorlevel
end
return (
errorlevel +
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 1ece096e7f3..d97fecd8298 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-08-07"
+release_date = "2018-09-21"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")