From e701677aa361258a69f40dad5187444352c6e14b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Aug 2018 20:54:38 +0000 Subject: l3build (4aug18) git-svn-id: svn://tug.org/texlive/trunk@48348 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/l3build/l3build.lua | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index 5cefd6d5dc0..2107f024d3a 100644 --- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua +++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2018-08-02" +release_date = "2018-08-04" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -34,6 +34,7 @@ local lfs = require("lfs") local assert = assert local ipairs = ipairs +local insert = table.insert local lookup = kpse.lookup local match = string.match local next = next @@ -123,13 +124,28 @@ if options["target"] == "check" then if #checkconfigs > 1 then local errorlevel = 0 local opts = options + local failed = { } for i = 1, #checkconfigs do opts["config"] = {checkconfigs[i]} errorlevel = call({"."}, "check", opts) - if errorlevel ~= 0 then exit(1) end + if errorlevel ~= 0 then + if options["halt-on-error"] then + exit(1) + else + insert(failed,checkconfigs[i]) + end + end + end + if next(failed) then + print(" Failed tests for configs:") + for _,config in ipairs(failed) do + print(" - " .. config) + end + exit(1) + else + -- Avoid running the 'main' set of tests twice + exit(0) end - -- Avoid running the 'main' set of tests twice - exit(0) end end if #checkconfigs == 1 and -- cgit v1.2.3