summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-08 23:01:35 +0000
committerKarl Berry <karl@freefriends.org>2017-03-08 23:01:35 +0000
commit6fca20c09474a7f6a3559af1c984243a83669f61 (patch)
treecbfda048c91853241ef903a84a088c1e3a66fd50 /Master/texmf-dist/tex/latex/l3build
parentddbc1f2a5f193876d6f1df544e286029c6d671f8 (diff)
l3 (8mar17)
git-svn-id: svn://tug.org/texlive/trunk@43432 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3build')
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua41
-rw-r--r--Master/texmf-dist/tex/latex/l3build/regression-test.tex2
2 files changed, 37 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index 4d7e8abe192..bfbe73e91c4 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -23,8 +23,8 @@ for those people who are interested.
--]]
-- Version information: should be identical to that in l3build.dtx
-release_date = "2017/01/25"
-release_ver = "6826"
+release_date = "2017/03/07"
+release_ver = "6984"
-- "module" is a deprecated function in Lua 5.2: as we want the name
-- for other purposes, and it should eventually be 'free', simply
@@ -774,6 +774,8 @@ function formatlog(logfile, newfile, engine)
-- Zap line numbers from \show, \showbox, \box_show and the like:
-- do this before wrapping lines
line = string.gsub(line, "^l%.%d+ ", "l. ...")
+ -- Also from lua stack traces.
+ line = string.gsub(line, "lua:%d+: in function", "lua:...: in function")
-- Allow for wrapped lines: preserve the content and wrap
-- Skip lines that have an explicit marker for truncation
if string.len(line) == maxprintline and
@@ -799,7 +801,12 @@ function formatlog(logfile, newfile, engine)
line = string.gsub(line, "%(%.%/", "(")
-- Zap paths if places other than 'here' are accessible
if checksearch then
- line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%)?%s*$", "(../%1")
+ local pattern = "%w?:?/[^ ]*/([^/%(%)]*%.%w*)"
+ -- Files loaded from TeX: all start ( -- )
+ line = string.gsub(line, "%(" .. pattern, "(../%1")
+ -- luaotfload files start with keywords
+ line = string.gsub(line, "from " .. pattern .. "%(", "from. ./%1(")
+ line = string.gsub(line, ": " .. pattern .. "%)", ": ../%1)")
end
-- Deal with the fact that "(.aux)" may have still a leading space
line = string.gsub(line, "^ %(%.aux%)", "(.aux)")
@@ -1119,7 +1126,7 @@ function runcheck(name, hide)
errlevel = compare_tlg(name, engine)
end
if errlevel ~= 0 and opthalt then
- checkdiff()
+ showfaileddiff()
if errlevel ~= 0 then
return 1
end
@@ -1599,6 +1606,23 @@ function checkdiff()
print("")
end
+function showfaileddiff()
+ print("\nCheck failed with difference file")
+ for _,i in ipairs(filelist(testdir, "*" .. os_diffext)) do
+ print(" - " .. testdir .. "/" .. i)
+ print("")
+ local f = io.open(testdir .. "/" .. i,"r")
+ local content = f:read("*all")
+ f:close()
+ print("-----------------------------------------------------------------------------------")
+ print(content)
+ print("-----------------------------------------------------------------------------------")
+ end
+ for _,i in ipairs(filelist(testdir, "*" .. os_cmpext)) do
+ print(" - " .. testdir .. "/" .. i)
+ end
+end
+
-- Remove all generated files
function clean()
-- To make sure that distribdir never contains any stray subdirs,
@@ -1634,13 +1658,20 @@ function cmdcheck()
mkdir(localdir)
cleandir(testdir)
depinstall(checkdeps)
+ for _,i in ipairs({bibfiles, docfiles, sourcefiles, typesetfiles}) do
+ for _,j in ipairs(i) do
+ cp(j, ".", testdir)
+ end
+ end
+ for _,i in ipairs(typesetsuppfiles) do
+ cp(i, supportdir, testdir)
+ end
local engine = string.gsub(stdengine, "tex$", "latex")
local localdir = relpath(localdir, testdir)
print("Checking source files")
for _,i in ipairs(cmdchkfiles) do
for _,j in ipairs(filelist(".", i)) do
print(" " .. stripext(j))
- cp(j, ".", testdir)
run(
testdir,
os_setenv .. " TEXINPUTS=." .. os_pathsep .. localdir
diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
index 86d722d7862..b11581fae21 100644
--- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex
+++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
@@ -89,7 +89,7 @@
\LONGTYPEOUT{Bad conditionals: \the\numexpr\currentiflevel-2!}%
\fi
\fi
- \LONGTYPEOUT{END-TEST-LOG}\@@@end
+ \LONGTYPEOUT{^^JEND-TEST-LOG^^J}\@@@end
}
\ifx\@@end\@undefined
\let\end\END