summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-19 22:45:06 +0000
committerKarl Berry <karl@freefriends.org>2024-01-19 22:45:06 +0000
commit658373a9bbeff724374065a08da0268c19805a95 (patch)
tree9fcb04dff2dfab6d679029fe24ca5dd4d79238e9 /Master/texmf-dist/scripts/l3build
parentf1cee4627684d3feed6f0552d428cf9f1cd3584d (diff)
l3build (19jan24)
git-svn-id: svn://tug.org/texlive/trunk@69495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-arguments.lua51
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua8
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-stdmain.lua8
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
4 files changed, 33 insertions, 36 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
index a1755d693dc..ec3b5335d38 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
@@ -54,7 +54,7 @@ option_list =
},
dirty =
{
- desc = "Skip cleaning up the test area",
+ desc = "Skips cleaning up the test area",
type = "boolean"
},
["dry-run"] =
@@ -80,7 +80,7 @@ option_list =
},
file =
{
- desc = "Take the upload announcement from the given file",
+ desc = "Takes the upload announcement from the given file",
short = "F",
type = "string"
},
@@ -89,15 +89,9 @@ option_list =
desc = "Name of first test to run",
type = "string"
},
- force =
- {
- desc = "Force tests to run if engine is not set up",
- short = "f",
- type = "boolean"
- },
full =
{
- desc = "Install all files",
+ desc = "Installs all files",
type = "boolean"
},
["halt-on-error"] =
@@ -108,7 +102,7 @@ option_list =
},
help =
{
- desc = "Print this message and exit",
+ desc = "Prints this message and exits",
short = "h",
type = "boolean"
},
@@ -131,23 +125,29 @@ option_list =
},
rerun =
{
- desc = "Skip setup: simply rerun tests",
+ desc = "Skips setup: simply reruns tests",
type = "boolean"
},
["show-log-on-error"] =
{
- desc = "Show the full log of the failure with 'halt-on-error'",
+ desc = "Shows the full log of the failure with 'halt-on-error'",
type = "boolean"
},
["show-saves"] =
{
- desc = "Show the invocation to update failing .tlg files",
+ desc = "Shows the invocation to update failing .tlg files",
short = "S",
type = "boolean"
},
shuffle =
{
- desc = "Shuffle order of tests",
+ desc = "Shuffles order of tests",
+ type = "boolean"
+ },
+ stdengine =
+ {
+ desc = "Run tests only with the standard engine (which may vary between configs)",
+ short = "s",
type = "boolean"
},
texmfhome =
@@ -157,7 +157,7 @@ option_list =
},
version =
{
- desc = "Print version information and exit",
+ desc = "Prints version information and exits",
type = "boolean"
}
}
@@ -292,22 +292,23 @@ options = argparse()
-- Sanity check
function check_engines(config)
- if options["engine"] and not options["force"] then
+ if options["engine"] then
-- Make a lookup table
local t = { }
for _, engine in pairs(checkengines) do
t[engine] = true
end
- for _, engine in pairs(options["engine"]) do
- if not t[engine] then
- print("\n! Error: Engine \"" .. engine .. "\" not set up for testing with configuration \"" .. config .. "\"!")
- print("\n Valid values are:")
- for _, engine in ipairs(checkengines) do
- print(" - " .. engine)
- end
- print("")
- exit(1)
+ checkengines = {}
+ for _,engine in ipairs(options["engine"]) do
+ if t[engine] then
+ insert(checkengines,engine)
+ else
+ print("Skipping unknown engine " .. engine)
end
end
end
+ if not next(checkengines) then
+ print("No applicable engine requested, config ignored")
+ exit(0)
+ end
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 2a50c590dbb..9bfb09971a7 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -595,8 +595,8 @@ function runcheck(name, hide)
return 1
end
local checkengines = checkengines
- if options["engine"] then
- checkengines = options["engine"]
+ if options["stdengine"] then
+ checkengines = {stdengine}
end
local failedengines = {}
-- Used for both .lvt and .pvt tests
@@ -1065,10 +1065,6 @@ function checkdiff(config)
if next(diff_files) then
if config then
print("Failed tests for configuration \"" .. config .. "\":")
- local testdir = testdir
- if config ~= "build" then
- testdir = testdir .. "-" .. config
- end
end
print("\n Check failed with difference files")
for _,i in ipairs(diff_files) do
diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
index d264a78fa48..70d7560f20c 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
@@ -73,19 +73,19 @@ target_list =
check =
{
bundle_target = true,
- desc = "Run all automated tests",
+ desc = "Runs all automated tests",
func = check,
},
clean =
{
bundle_func = bundleclean,
- desc = "Clean out directory tree",
+ desc = "Cleans out directory tree",
func = clean
},
ctan =
{
bundle_func = ctan,
- desc = "Create CTAN-ready archive",
+ desc = "Creates CTAN-ready archive",
func = ctan
},
doc =
@@ -142,7 +142,7 @@ target_list =
},
upload =
{
- desc = "Send archive to CTAN for public release",
+ desc = "Sends archive to CTAN for public release",
func = upload
},
}
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 8b0dcbda6f8..5575dc9b909 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 = "2024-01-09"
+release_date = "2024-01-18"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")