texlive[43054] Master/texmf-dist: l3build (26jan17)
commits+karl at tug.org
commits+karl at tug.org
Thu Jan 26 23:19:01 CET 2017
Revision: 43054
http://tug.org/svn/texlive?view=revision&revision=43054
Author: karl
Date: 2017-01-26 23:19:01 +0100 (Thu, 26 Jan 2017)
Log Message:
-----------
l3build (26jan17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/l3build/README.md
trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
trunk/Master/texmf-dist/source/latex/l3build/l3build.ins
trunk/Master/texmf-dist/tex/latex/l3build/l3build.lua
trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex
Modified: trunk/Master/texmf-dist/doc/latex/l3build/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/README.md 2017-01-26 22:18:47 UTC (rev 43053)
+++ trunk/Master/texmf-dist/doc/latex/l3build/README.md 2017-01-26 22:19:01 UTC (rev 43054)
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX3
=================================================
-Release 2016/11/21 (r6760)
+Release 2017/01/25 (r6826)
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2017-01-26 22:18:47 UTC (rev 43053)
+++ trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2017-01-26 22:19:01 UTC (rev 43054)
@@ -1,46 +1,31 @@
% \iffalse
-%%
-%% File l3build.dtx (C) Copyright 2014-2016 The LaTeX3 Project
-%%
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License (LPPL), either version 1.3c of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3build bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
%
+% File l3build.dtx (C) Copyright 2014-2017 The LaTeX3 Project
%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3build bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
%<*driver>
\RequirePackage{expl3}
\def\ExplFileName{l3build}
\def\ExplFileDescription{L3 Regression test suite}
-\def\ExplFileDate{2016/11/21}
-\def\ExplFileVersion{6760}
+\def\ExplFileDate{2017/01/25}
+\def\ExplFileVersion{6826}
\documentclass[full]{l3doc}
\renewcommand\partname{Part}
\usepackage{multicol,needspace}
@@ -327,6 +312,7 @@
% \item \texttt{--quiet} (\texttt{-q}) Suppresses output from unpacking
% \item \texttt{--release} (\texttt{-r}) Release string to use when setting
% version data
+% \item \texttt{--textfiledir} (\texttt{-t}) Select a specific set of tests
% \end{itemize}
%
% \begin{buildcmd}{check}
@@ -605,6 +591,35 @@
%
% \luavartypeset
%
+% \subsection{Multiple sets of tests}
+%
+% In most cases, a single set of tests will be appropriate for the module, with
+% a common set of configuration settings applying. However, there are situations
+% where you may need entirely independent sets of tests which have different
+% setting values, for example using different formats or where the entire set
+% will be engine-dependent. To support this, \pkg{l3build} offers the |--testfiledir|
+% (|-t|) command line option. When this is given with a directory argument it
+% overrides the \var{testfiledir} variable. Moreover, before the tests are run,
+% \pkg{l3build} will read |config.lua| within the directory (if available). This
+% should comprise a list of settings which apply to the tests in place of those in
+% the main build script.
+%
+% For example, for the core \LaTeXe{} tests the main test files are contained
+% in a directory |testfiles| and have \var{checksearch} set \var{false}. To test
+% font loading for \XeTeX{} and \LuaTeX{} there are a second set of tests in
+% |testfiles-TU| which use the short |config.lua| file shown in
+% Figure~\ref{fig:testfiledir}. These additional tests are then run using
+% |texlua build.lua check --testfiledir=testfiles-TU|.
+% \begin{figure}
+% \begin{lstlisting}[frame=single,language={[5.2]Lua},gobble = 6]
+% -- Special config for these tests
+% checksearch = true
+% checkengines = {"xetex","luatex"}
+% \end{lstlisting}
+% \caption{The build script for the \pkg{xparse} module.}
+% \label{fig:testfiledir}
+% \end{figure}
+%
% \subsection{Dependencies}
%
% If you have multiple packages that are developed separately but still interact in some way, it's often desirable to integrate them when performing regression tests.
@@ -1179,7 +1194,7 @@
% Is this necessary any more? Probably too late to remove it.
% \begin{macrocode}
\def\STARTMESSAGE{This is a generated file for the l3build validation system.}
-\def\START{\LONGTYPEOUT{START-TEST-LOG^^J^^J%
+\def\START{\LONGTYPEOUT{^^JSTART-TEST-LOG^^J^^J%
\STARTMESSAGE%
^^J^^JDon't change this file in any respect.%
^^J^^J}}
Modified: trunk/Master/texmf-dist/source/latex/l3build/l3build.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3build/l3build.ins 2017-01-26 22:18:47 UTC (rev 43053)
+++ trunk/Master/texmf-dist/source/latex/l3build/l3build.ins 2017-01-26 22:19:01 UTC (rev 43054)
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File l3build.ins Copyright (C) 2014 The LaTeX3 Project
+File l3build.ins Copyright (C) 2014,2016 The LaTeX3 Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -12,8 +12,19 @@
This file is part of the "l3build bundle" (The Work in LPPL)
and all files in that bundle must be distributed together.
-The released version of this bundle is available from CTAN.
+-----------------------------------------------------------------------
+The development version of the bundle can be found at
+
+ https://github.com/latex3/latex3
+
+for those people who are interested.
+
+-----------------------------------------------------------------------
+
+Any modification of this file should ensure that the copyright and
+license information is placed in the derived files.
+
\fi
\input docstrip.tex
@@ -21,13 +32,18 @@
\preamble
-EXPERIMENTAL CODE
+Copyright (C) 2014-2016 The LaTeX3 Project
-Do not distribute this file without also distributing the
-source files specified above.
+It may be distributed and/or modified under the conditions of
+the LaTeX Project Public License (LPPL), either version 1.3c of
+this license or (at your option) any later version. The latest
+version of this license is in the file:
-Do not distribute a modified version of this file.
+ http://www.latex-project.org/lppl.txt
+This file is part of the "l3build bundle" (The Work in LPPL)
+and all files in that bundle must be distributed together.
+
\endpreamble
% stop docstrip adding \endinput
\postamble
Modified: trunk/Master/texmf-dist/tex/latex/l3build/l3build.lua
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3build/l3build.lua 2017-01-26 22:18:47 UTC (rev 43053)
+++ trunk/Master/texmf-dist/tex/latex/l3build/l3build.lua 2017-01-26 22:19:01 UTC (rev 43054)
@@ -1,24 +1,30 @@
--[[
- File l3build.lua (C) Copyright 2014-2016 The LaTeX3 Project
+File l3build.lua Copyright (C) 2014-2017 The LaTeX3 Project
- It may be distributed and/or modified under the conditions of the
- LaTeX Project Public License (LPPL), either version 1.3c of this
- license or (at your option) any later version. The latest version
- of this license is in the file
+It may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), either version 1.3c of this
+license or (at your option) any later version. The latest version
+of this license is in the file
- http://www.latex-project.org/lppl.txt
+ http://www.latex-project.org/lppl.txt
- This file is part of the "l3build bundle" (The Work in LPPL)
- and all files in that bundle must be distributed together.
+This file is part of the "l3build bundle" (The Work in LPPL)
+and all files in that bundle must be distributed together.
- The released version of this bundle is available from CTAN.
+-----------------------------------------------------------------------
+The development version of the bundle can be found at
+
+ https://github.com/latex3/latex3
+
+for those people who are interested.
+
--]]
-- Version information: should be identical to that in l3build.dtx
-release_date = "2016/11/21"
-release_ver = "6760"
+release_date = "2017/01/25"
+release_ver = "6826"
-- "module" is a deprecated function in Lua 5.2: as we want the name
-- for other purposes, and it should eventually be 'free', simply
@@ -175,34 +181,37 @@
local files = { }
local long_options =
{
- date = "date" ,
- engine = "engine" ,
- ["halt-on-error"] = "halt" ,
- ["halt-on-failure"] = "halt" ,
- help = "help" ,
- pdf = "pdf" ,
- quiet = "quiet" ,
- release = "release"
+ date = "date" ,
+ engine = "engine" ,
+ ["halt-on-error"] = "halt" ,
+ ["halt-on-failure"] = "halt" ,
+ help = "help" ,
+ pdf = "pdf" ,
+ quiet = "quiet" ,
+ release = "release" ,
+ testfiledir = "testfiledir"
}
local short_options =
{
- d = "date" ,
- e = "engine" ,
- h = "help" ,
- H = "halt" ,
- p = "pdf" ,
- q = "quiet" ,
- r = "release"
+ d = "date" ,
+ e = "engine" ,
+ h = "help" ,
+ H = "halt" ,
+ p = "pdf" ,
+ q = "quiet" ,
+ r = "release" ,
+ t = "testfiledir"
}
local option_args =
{
- date = true ,
- engine = true ,
- halt = false,
- help = false,
- pdf = false,
- quiet = false,
- release = true
+ date = true ,
+ engine = true ,
+ halt = false,
+ help = false,
+ pdf = false,
+ quiet = false,
+ release = true,
+ testfiledir = true
}
-- arg[1] is a special case: must be a command or "-h"/"--help"
-- Deal with this by assuming help and storing only apparently-valid
@@ -1097,7 +1106,7 @@
for _,i in ipairs(checkengines) do
-- Allow for luatex == luajittex for .tlg purposes
local engine = i
- if i == "luajitex" then
+ if i == "luajittex" then
engine = "luatex"
end
checkpdf = setup_check(name, engine)
@@ -1111,7 +1120,9 @@
end
if errlevel ~= 0 and opthalt then
checkdiff()
- return errlevel
+ if errlevel ~= 0 then
+ return 1
+ end
end
if errlevel > errorlevel then
errorlevel = errlevel
@@ -1525,6 +1536,7 @@
print(" --pdf|-p Check/save PDF files")
print(" --quiet|-q Suppresses TeX output when unpacking")
print(" --release|-r Sets the release to insert into sources")
+ print(" --testfiledir|-t Selects the specified testfile location")
print("")
print("See l3build.pdf for further details.")
end
@@ -2142,5 +2154,18 @@
-- Allow main function to be disabled 'higher up'
main = main or stdmain
+-- Pick up and read any per-run testfiledir
+if userargs["testfiledir"] then
+ if #userargs["testfiledir"] == 1 then
+ testfiledir = userargs["testfiledir"][1]
+ if fileexists(testfiledir .. "/config.lua") then
+ dofile(testfiledir .. "/config.lua")
+ end
+ else
+ print("Cannot use more than one testfile dir at a time!")
+ return 1
+ end
+end
+
-- Call the main function
main(userargs["target"], userargs["files"])
Modified: trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex 2017-01-26 22:18:47 UTC (rev 43053)
+++ trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex 2017-01-26 22:19:01 UTC (rev 43054)
@@ -6,47 +6,18 @@
%%
%% l3build.dtx (with options: `package')
%%
-%% EXPERIMENTAL CODE
+%% Copyright (C) 2014-2016 The LaTeX3 Project
%%
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version. The latest
+%% version of this license is in the file:
%%
-%% Do not distribute a modified version of this file.
+%% http://www.latex-project.org/lppl.txt
%%
-%%
-%% File l3build.dtx (C) Copyright 2014-2016 The LaTeX3 Project
-%%
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License (LPPL), either version 1.3c of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
%% This file is part of the "l3build bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
+%%
\ifx\unprotect\undefined
\expandafter\edef\csname reset\string @catcodes\endcsname{%
\catcode`\noexpand\@=\the\catcode`\@\relax
@@ -71,7 +42,7 @@
}
\let\TYPE\LONGTYPEOUT
\def\STARTMESSAGE{This is a generated file for the l3build validation system.}
-\def\START{\LONGTYPEOUT{START-TEST-LOG^^J^^J%
+\def\START{\LONGTYPEOUT{^^JSTART-TEST-LOG^^J^^J%
\STARTMESSAGE%
^^J^^JDon't change this file in any respect.%
^^J^^J}}
More information about the tex-live-commits
mailing list