diff options
author | Karl Berry <karl@freefriends.org> | 2023-02-20 21:01:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-02-20 21:01:17 +0000 |
commit | 581ad0b74b17bcdc81b09c04368271bf453562bb (patch) | |
tree | 33ddde7f8a8c109a777ca3efa9bf2df72028adec /Master/texmf-dist/scripts/l3build | |
parent | d64be73b8aea11c37d5fc24ef6db13de68a249a7 (diff) |
l3build (20feb23)
git-svn-id: svn://tug.org/texlive/trunk@65983 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-check.lua | 7 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/l3build/l3build.lua | 35 |
2 files changed, 24 insertions, 18 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index d6d68086bcc..b77a7e26cc4 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -55,7 +55,10 @@ local remove = os.remove -- Set up the check system files: needed for checking one or more tests and -- for saving the test files function checkinit() - if not options["dirty"] then + if options["dirty"] then + mkdir(testdir) + mkdir(resultdir) + else cleandir(testdir) cleandir(resultdir) end @@ -787,6 +790,8 @@ function runtest(name, engine, hide, ext, test_type, breakout) os_setenv .. " LUAINPUTS=." .. localtexmf() .. (checksearch and os_pathsep or "") .. os_concat .. + -- ensure epoch settings + set_epoch_cmd(epoch, forcecheckepoch) .. -- Ensure lines are of a known length os_setenv .. " max_print_line=" .. maxprintline .. os_concat .. diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 110d3947720..ff80523b174 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 = "2023-02-16" +release_date = "2023-02-20" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -205,22 +205,23 @@ if #checkconfigs > 1 then end end if #checkconfigs == 1 and - checkconfigs[1] ~= "build" 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) - end + checkconfigs[1] ~= "build" and + (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then + local configname = gsub(checkconfigs[1], "%.lua$", "") + local config = "./" .. configname .. ".lua" + if fileexists(config) then + local savedtestfiledir = testfiledir + dofile(config) + testdir = testdir .. "-" .. configname + -- 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) + end end -- Call the main function |