[latex3-commits] [git/LaTeX3-latex3-latex2e] travis-test: Integrate test files (8e9d7acc)
PhelypeOleinik
tex.phelype at gmail.com
Sat Aug 15 07:10:22 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : travis-test
Link : https://github.com/latex3/latex2e/commit/8e9d7acc7e53e426940aa6a2f6e2eb4a1b704987
>---------------------------------------------------------------
commit 8e9d7acc7e53e426940aa6a2f6e2eb4a1b704987
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date: Sat Aug 15 02:10:22 2020 -0300
Integrate test files
>---------------------------------------------------------------
8e9d7acc7e53e426940aa6a2f6e2eb4a1b704987
.../filehook-001.lvt | 16 ++---
.../filehook-001.tlg | 7 +--
base/testfiles-lthooks/filehook-005.lvt | 35 +----------
.../filehook-006.lvt | 1 +
.../filehook-006.tlg | 16 +++--
.../filehook-008.lvt | 3 +-
.../filehook-008.tlg | 6 +-
base/testfiles-lthooks/filehook-010.lvt | 52 ++++++++++++++++
.../{filehook-003.tlg => filehook-010.tlg} | 71 ++++++++++------------
base/testfiles-lthooks/filehook-011.lvt | 26 ++++++++
.../filehook-011.tlg} | 11 +++-
base/testfiles-lthooks/filehook-012.lvt | 20 ++++++
base/testfiles-lthooks/filehook-012.tlg | 38 ++++++++++++
base/testfiles-lthooks/lthooks-021.lvt | 3 +-
base/testfiles-lthooks/shipout-006.lvt | 15 +++++
.../shipout-006.tlg} | 0
16 files changed, 216 insertions(+), 104 deletions(-)
diff --git a/base/testfiles-lthooks-broken/filehook-001.lvt b/base/testfiles-lthooks/filehook-001.lvt
similarity index 91%
copy from base/testfiles-lthooks-broken/filehook-001.lvt
copy to base/testfiles-lthooks/filehook-001.lvt
index dfd1494e..dc073319 100644
--- a/base/testfiles-lthooks-broken/filehook-001.lvt
+++ b/base/testfiles-lthooks/filehook-001.lvt
@@ -2,6 +2,11 @@
\input{regression-test}
+\makeatletter
+\declare at file@substitution{filehook.sty}{filehook-ltx.sty}
+\makeatother
+\RequirePackage{filehook}
+
\def\Hook#1{\ifx#1\undefined
\typeout{Not defined: \string#1}%
\else #1{\typeout{\string#1 - code (for \CurrentFile)}}\fi}
@@ -31,11 +36,6 @@
\includeonly{\jobname-x,baz with.tex and spaces,bar} % baz excluded
-% preload this so it is already loaded below
-\RequirePackage{fltrace}
-
-\RequirePackage{lthooks} % lthooks implements part of filehook.sty so this test has to change when
- % that package is updated
\START
@@ -79,8 +79,8 @@
\NamedHook\AtEndOfIncludeFile{bar}
\NamedHook\AfterIncludeFile{bar}
-\NamedHook\AtBeginOfPackageFile{fltrace}
-\NamedHook\AtEndOfPackageFile{fltrace}
+\NamedHook\AtBeginOfPackageFile{filehook}
+\NamedHook\AtEndOfPackageFile{filehook}
\NamedHook\AtBeginOfPackageFile{\jobname-pkg}
\NamedHook\AtEndOfPackageFile{\jobname-pkg}
@@ -95,7 +95,7 @@
\typeout{---------------- \string\usepackage\space (already loaded) ------------}
-\usepackage{fltrace}
+\usepackage{filehook}
\typeout{---------------- \string\usepackage\space (new) ------------}
\usepackage{\jobname-pkg}
diff --git a/base/testfiles-lthooks-broken/filehook-001.tlg b/base/testfiles-lthooks/filehook-001.tlg
similarity index 97%
copy from base/testfiles-lthooks-broken/filehook-001.tlg
copy to base/testfiles-lthooks/filehook-001.tlg
index 4feff931..21c78460 100644
--- a/base/testfiles-lthooks-broken/filehook-001.tlg
+++ b/base/testfiles-lthooks/filehook-001.tlg
@@ -55,10 +55,7 @@ File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
\g__pdf_backend_link_sf_int=\count...
)
\AtEndOfEveryFile - code (for l3backend-dvips.def)
-(filehook-001.aux (filehook-001-x.aux) (baz with.tex and spaces.aux)
-(bar.aux)
-No file "baz.aux".
-)
+No file filehook-001.aux.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
@@ -111,7 +108,7 @@ filehook-001-x
! LaTeX Error: File `filehook-001-?? with space.tex' not found.
but for this test we continue ...
\AtBeginOfEveryFile - code (for .tex)
-(../.tex File ignored)
+(.tex File ignored)
\AtEndOfEveryFile - code (for .tex)
---------------- \InputIfFileExists ------------
T
diff --git a/base/testfiles-lthooks/filehook-005.lvt b/base/testfiles-lthooks/filehook-005.lvt
index 282d1f3b..4bf5463a 100644
--- a/base/testfiles-lthooks/filehook-005.lvt
+++ b/base/testfiles-lthooks/filehook-005.lvt
@@ -1,37 +1,4 @@
-\makeatletter
-\ExplSyntaxOn
-\cs_gset:Npn \__file_full_name:n #1
- {
- \tl_if_blank:nF {#1}
- {
- \tl_if_blank:eTF { \__file_size:n {#1} }
- {
- \seq_map_tokens:Nn \l_file_search_path_seq
- { \__file_full_name_aux:Nnn \seq_map_break:n {#1} }
- \cs_if_exist:NT \input at path
- {
- \tl_map_tokens:Nn \input at path
- { \__file_full_name_aux:Nnn \tl_map_break:n {#1} }
- }
- \__file_name_end:
- }
- { \__file_ext_check:n {#1} }
- }
- }
-\cs_gset:Npn \__file_full_name_aux:Nnn #1#2#3
- { \exp_args:Ne \__file_full_name_aux:nN { \tl_to_str:n {#3} / #2 } #1 }
-\cs_gset:Npn \__file_full_name_aux:nN #1 #2
- {
- \tl_if_blank:eF { \__file_size:n {#1} }
- {
- #2
- {
- \__file_ext_check:n {#1}
- \__file_name_cleanup:w
- }
- }
- }
-\ExplSyntaxOff
+
\documentclass{article}
diff --git a/base/testfiles-lthooks2/filehook-006.lvt b/base/testfiles-lthooks/filehook-006.lvt
similarity index 99%
rename from base/testfiles-lthooks2/filehook-006.lvt
rename to base/testfiles-lthooks/filehook-006.lvt
index 8c5377ae..baec676e 100644
--- a/base/testfiles-lthooks2/filehook-006.lvt
+++ b/base/testfiles-lthooks/filehook-006.lvt
@@ -1,3 +1,4 @@
+
\documentclass{article}
\input{regression-test}
diff --git a/base/testfiles-lthooks2/filehook-006.tlg b/base/testfiles-lthooks/filehook-006.tlg
similarity index 88%
rename from base/testfiles-lthooks2/filehook-006.tlg
rename to base/testfiles-lthooks/filehook-006.tlg
index 2538ec7d..eb9dbb90 100644
--- a/base/testfiles-lthooks2/filehook-006.tlg
+++ b/base/testfiles-lthooks/filehook-006.tlg
@@ -1,16 +1,14 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-LaTeX Warning: Writing or overwriting file `./filehook-006-1.sty'.
-LaTeX Warning: Writing or overwriting file `./filehook-006-2.sty'.
+LaTeX Warning: Writing file `./filehook-006-1.sty'.
+LaTeX Warning: Writing file `./filehook-006-2.sty'.
(filehook-006-1.sty
Package filehook-006-1 with option X
) (filehook-006-2.sty
Do something
)
-LaTeX Warning: File `file-1.tex' already exists on the system.
- Not generating it from this source.
-LaTeX Warning: File `file-2.tex' already exists on the system.
- Not generating it from this source.
+LaTeX Warning: Writing file `./file-1.tex'.
+LaTeX Warning: Writing file `./file-2.tex'.
---------------------------------------
===============
Inside top-level (before):
@@ -29,7 +27,7 @@ Inside file-2 (before):
File: file-2.tex
Path:
===============
-(../.tex File ignored)
+(.tex File ignored)
===============
Inside file-2 (after):
File: file-2.tex
@@ -57,7 +55,7 @@ File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
\g__pdf_backend_link_int=\count...
\g__pdf_backend_link_sf_int=\count...
)
-(filehook-006.aux)
+No file filehook-006.aux.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
@@ -90,7 +88,7 @@ Inside file-2 (before):
File: file-2.tex
Path:
===============
-(../.tex File ignored)
+(.tex File ignored)
===============
Inside file-2 (after):
File: file-2.tex
diff --git a/base/testfiles-lthooks2/filehook-008.lvt b/base/testfiles-lthooks/filehook-008.lvt
similarity index 97%
rename from base/testfiles-lthooks2/filehook-008.lvt
rename to base/testfiles-lthooks/filehook-008.lvt
index 32692231..6009123b 100644
--- a/base/testfiles-lthooks2/filehook-008.lvt
+++ b/base/testfiles-lthooks/filehook-008.lvt
@@ -1,3 +1,4 @@
+
\documentclass{article}
\ExplSyntaxOn
@@ -16,7 +17,7 @@
\makeatletter
% A package
-\declare at file@substitution{wrong.sty}{trace.sty}
+\declare at file@substitution{wrong.sty}{bezier.sty}
\usepackage{wrong}
\def\undoone#1{%
diff --git a/base/testfiles-lthooks2/filehook-008.tlg b/base/testfiles-lthooks/filehook-008.tlg
similarity index 97%
rename from base/testfiles-lthooks2/filehook-008.tlg
rename to base/testfiles-lthooks/filehook-008.tlg
index b0e89fdc..e8e3edf5 100644
--- a/base/testfiles-lthooks2/filehook-008.tlg
+++ b/base/testfiles-lthooks/filehook-008.tlg
@@ -1,10 +1,6 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-(trace.sty
-LaTeX Warning: You have requested package `wrong',
- but the package provides `trace'.
-Package: trace ....-..-.. v... trace LaTeX code
-)
+(bezier.sty)
! Undefined control sequence.
<argument> LaTeX3 error:
File loop! g.tex replaced by i.tex...
diff --git a/base/testfiles-lthooks/filehook-010.lvt b/base/testfiles-lthooks/filehook-010.lvt
new file mode 100644
index 00000000..c11ca16e
--- /dev/null
+++ b/base/testfiles-lthooks/filehook-010.lvt
@@ -0,0 +1,52 @@
+
+
+\makeatletter
+\let\texread\read
+\def\defread#1{%
+\def\read##1to##2{%
+ \ifx\m at ne##1%
+ \ifx\@gtempa##2%
+ \def##2{#1}%
+ \expandafter\expandafter
+ \expandafter\@gobbletwo
+ \else
+ \texread
+ \fi
+ \else
+ \texread
+ \fi
+ \@firstofone{##1to##2}}}
+\makeatother
+
+\begin{filecontents}[overwrite]{hbox.sty}
+\def\blub{opt unused}
+\ProvidesPackage{hbox}[2020-10-01 v9.9
+ The best package ever]
+\DeclareOption{opt}{\def\blub{opt used}}
+\ProcessOptions\relax
+\typeout{Option: \blub}
+\end{filecontents}
+
+\input{regression-test}
+\START
+
+\defread{article}
+\documentclass[12pt,unknown,opt]{atricle}
+
+\PassOptionsToPackage{unknown}{hobx}
+
+\defread{hbox}
+\usepackage{hobx}
+
+\makeatletter
+\defread{}
+\show\@currnamestack
+\usepackage{mepty}
+\show\@currnamestack
+
+% Fun fact:
+\defread{minimal.cls}
+\usepackage{another-class}
+
+\begin{document}
+\end{document}
diff --git a/base/testfiles-lthooks/filehook-003.tlg b/base/testfiles-lthooks/filehook-010.tlg
similarity index 59%
copy from base/testfiles-lthooks/filehook-003.tlg
copy to base/testfiles-lthooks/filehook-010.tlg
index e2a813fd..4be5df17 100644
--- a/base/testfiles-lthooks/filehook-003.tlg
+++ b/base/testfiles-lthooks/filehook-010.tlg
@@ -1,9 +1,12 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-(article.cls
+! LaTeX Error: File `atricle.cls' not found.
+Type X to quit or <RETURN> to proceed,
+or enter new name. (Default extension: cls)
+Enter file name: (article.cls
Document Class: article ....-..-.. v... Standard LaTeX document class
-(size10.clo
-File: size10.clo ....-..-.. v... Standard LaTeX file (size option)
+(size12.clo
+File: size12.clo ....-..-.. v... Standard LaTeX file (size option)
)
\c at part=\count...
\c at section=\count...
@@ -17,7 +20,29 @@ File: size10.clo ....-..-.. v... Standard LaTeX file (size option)
\belowcaptionskip=\skip...
\bibindent=\dimen...
)
-(../l3backend-dvips.def
+! LaTeX Error: File `hobx.sty' not found.
+Type X to quit or <RETURN> to proceed,
+or enter new name. (Default extension: sty)
+Enter file name: (hbox.sty
+Package: hbox ....-..-.. v... The best package ever
+Option: opt used
+)
+> \@currnamestack=macro:
+->.
+l. ...\show\@currnamestack
+! LaTeX Error: File `mepty.sty' not found.
+Type X to quit or <RETURN> to proceed,
+or enter new name. (Default extension: sty)
+Enter file name:
+> \@currnamestack=macro:
+->.
+l. ...\show\@currnamestack
+! LaTeX Error: File `another-class.sty' not found.
+Type X to quit or <RETURN> to proceed,
+or enter new name. (Default extension: sty)
+Enter file name: (minimal.cls
+Document Class: minimal ....-..-.. Standard LaTeX minimal class
+) (../l3backend-dvips.def
File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
@@ -27,7 +52,9 @@ File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
\g__pdf_backend_link_int=\count...
\g__pdf_backend_link_sf_int=\count...
)
-No file filehook-003.aux.
+LaTeX Warning: Unused global option(s):
+ [unknown].
+No file filehook-010.aux.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
@@ -42,36 +69,4 @@ LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line ....
LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line ....
LaTeX Font Info: ... okay on input line ....
-The hook 'include/before':
- Code chunks:
- A -> \typeout {A}
- B -> \typeout {B}
- C -> \typeout {C}
- Extra code next invocation:
- ---
- Rules:
- ---
- Execution order:
- A, B, C
-The hook 'include/after':
- Code chunks:
- A -> \typeout {A}
- B -> \typeout {B}
- C -> \typeout {C}
- Extra code next invocation:
- ---
- Rules:
- ---
- Execution order (after reversal):
- C, B, A
-The hook 'include/end':
- Code chunks:
- A -> \typeout {A}
- B -> \typeout {B}
- C -> \typeout {C}
- Extra code next invocation:
- ---
- Rules:
- ---
- Execution order (after reversal):
- C, B, A
+(filehook-010.aux)
diff --git a/base/testfiles-lthooks/filehook-011.lvt b/base/testfiles-lthooks/filehook-011.lvt
new file mode 100644
index 00000000..5b4b0f59
--- /dev/null
+++ b/base/testfiles-lthooks/filehook-011.lvt
@@ -0,0 +1,26 @@
+
+
+\begin{filecontents}[overwrite]{hbox.sty}
+\def\blub{opt unused}
+\ProvidesPackage{hbox}[2020-10-01 v9.9
+ The best package ever]
+\DeclareOption{opt}{\def\blub{opt used}}
+\ProcessOptions\relax
+\typeout{Option: \blub}
+\end{filecontents}
+
+\input{regression-test}
+\START
+
+\documentclass{article}
+
+\makeatletter
+\disable at package@load{hbox}%
+ {\typeout{Your package is rubbish}}
+\declare at file@substitution{wrong-pkg.sty}%
+ {hbox.sty}%
+
+\usepackage{hbox}
+\usepackage{wrong-pkg}
+
+\END
diff --git a/base/testfiles/github-0022c.tlg b/base/testfiles-lthooks/filehook-011.tlg
similarity index 62%
copy from base/testfiles/github-0022c.tlg
copy to base/testfiles-lthooks/filehook-011.tlg
index 9b992b46..0c0e0a96 100644
--- a/base/testfiles/github-0022c.tlg
+++ b/base/testfiles-lthooks/filehook-011.tlg
@@ -1,4 +1,4 @@
-This is a generated file for the LaTeX2e validation system.
+This is a generated file for the l3build validation system.
Don't change this file in any respect.
(article.cls
Document Class: article ....-..-.. v... Standard LaTeX document class
@@ -16,6 +16,11 @@ File: size10.clo ....-..-.. v... Standard LaTeX file (size option)
\abovecaptionskip=\skip...
\belowcaptionskip=\skip...
\bibindent=\dimen...
-) (github-0022c0.sty) (github-0022c1.sty
-*** FOO OPTION ***
+)
+Your package is rubbish
+(hbox.sty
+LaTeX Warning: You have requested package `wrong-pkg',
+ but the package provides `hbox'.
+Package: hbox ....-..-.. v... The best package ever
+Option: opt unused
)
diff --git a/base/testfiles-lthooks/filehook-012.lvt b/base/testfiles-lthooks/filehook-012.lvt
new file mode 100644
index 00000000..86b191a3
--- /dev/null
+++ b/base/testfiles-lthooks/filehook-012.lvt
@@ -0,0 +1,20 @@
+
+\expandafter\def\csname
+ ver at pkg-not-installed.sty\endcsname{Already loaded}
+\input{regression-test}
+\START
+\RequirePackage{pkg-not-installed}
+
+% Option clash
+\PassOptionsToPackage{full}{textcomp}
+\RequirePackage[almostfull]{textcomp}
+\RequirePackage[euro]{textcomp}
+
+% Date mismatch
+\RequirePackage{ifthen}
+\RequirePackage{ifthen}[3019-03-27]
+
+% Unprocessed option
+\RequirePackage[zzzz]{alltt}
+
+\END
diff --git a/base/testfiles-lthooks/filehook-012.tlg b/base/testfiles-lthooks/filehook-012.tlg
new file mode 100644
index 00000000..32f16098
--- /dev/null
+++ b/base/testfiles-lthooks/filehook-012.tlg
@@ -0,0 +1,38 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+(textcomp.sty
+Package: textcomp ....-..-.. v... Standard LaTeX package
+LaTeX Font Info: Changing ? sub-encoding to TS1/0 on input line ....
+LaTeX Font Info: Changing ? sub-encoding to TS1/1 on input line ....
+)
+! LaTeX Error: Option clash for package textcomp.
+See the LaTeX manual or LaTeX Companion for explanation.
+Type H <return> for immediate help.
+ ...
+l. ...
+The package textcomp has already been loaded with options:
+ [full,almostfull]
+There has now been an attempt to load it with options
+ [euro]
+Adding the global options:
+ full,almostfull,euro
+to your \documentclass declaration may fix this.
+Try typing <return> to proceed.
+(ifthen.sty
+Package: ifthen ....-..-.. v... Standard LaTeX ifthen package (DPC)
+)
+LaTeX Warning: You have requested, on input line ..., version
+ `....-..-..' of package ifthen,
+ but only version
+ `....-..-.. v... Standard LaTeX ifthen package (DPC)'
+ is available.
+(alltt.sty
+Package: alltt ....-..-.. v... defines alltt environment
+)
+! LaTeX Error: Unknown option `zzzz' for package `alltt'.
+See the LaTeX manual or LaTeX Companion for explanation.
+Type H <return> for immediate help.
+ ...
+l. ...
+The option `zzzz' was not declared in package `alltt', perhaps you
+misspelled its name. Try typing <return> to proceed.
diff --git a/base/testfiles-lthooks/lthooks-021.lvt b/base/testfiles-lthooks/lthooks-021.lvt
index 2dd9a8ae..a02c534e 100644
--- a/base/testfiles-lthooks/lthooks-021.lvt
+++ b/base/testfiles-lthooks/lthooks-021.lvt
@@ -8,6 +8,7 @@
\documentclass{article}
\input{regression-test}
+\START
\DebughookOn
@@ -21,7 +22,7 @@
% This should update all hooks that contain
% code from label1 and label2, but it doesn't
% because '??' isn't recognised:
-\DeclareHookRule{??}{label1}{removes}{label2}
+\DeclareHookRule{??}{label1}{voids}{label2}
\ShowHook{aaa}
diff --git a/base/testfiles-lthooks/shipout-006.lvt b/base/testfiles-lthooks/shipout-006.lvt
new file mode 100644
index 00000000..495b9805
--- /dev/null
+++ b/base/testfiles-lthooks/shipout-006.lvt
@@ -0,0 +1,15 @@
+\documentclass{article}
+
+\input{regression-test}
+
+\usepackage
+ {lthooks}
+
+
+\AddToHook {shipout/background}{\put(0,0){x}}
+\AddToHook {begindocument}{blub\clearpage} %fails
+%\AddToHook {begindocument/end}{blub\clearpage} %works
+\begin{document}
+abc
+\typeout{There should be no error and no log output}
+\end{document}
diff --git a/base/testfiles-TU/github-0282.tlg b/base/testfiles-lthooks/shipout-006.tlg
similarity index 100%
copy from base/testfiles-TU/github-0282.tlg
copy to base/testfiles-lthooks/shipout-006.tlg
More information about the latex3-commits
mailing list.