[latex3-commits] [l3svn] 02/02: l3build: Drop removal of file name during normalisation
noreply at latex-project.org
noreply at latex-project.org
Wed Jun 21 08:27:17 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit 0a5b8ed6c09b262ca8b3bd09bb68ba523ad52781
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Jun 21 07:26:23 2017 +0100
l3build: Drop removal of file name during normalisation
All this does is make some of the .tlg outcomes seem rather odd:
doesn't actually help (we very rarely want to rename tests without
re-running).
---
contrib/testfiles/chemformula001.ptex.tlg | 2 +-
contrib/testfiles/chemformula001.tlg | 2 +-
contrib/testfiles/chemformula001.uptex.tlg | 2 +-
contrib/testfiles/chemformula001.xetex.tlg | 2 +-
contrib/testfiles/ctex002.luatex.tlg | 2 +-
contrib/testfiles/ctex002.tlg | 2 +-
contrib/testfiles/ctex002.xetex.tlg | 2 +-
contrib/testfiles/fontspec001.luatex.tlg | 2 +-
contrib/testfiles/fontspec001.xetex.tlg | 2 +-
contrib/testfiles/mhchem001.tlg | 2 +-
contrib/testfiles/siunitx001.tlg | 2 +-
contrib/testfiles/unicode-math001.luatex.tlg | 2 +-
contrib/testfiles/unicode-math001.xetex.tlg | 2 +-
l3build/l3build.dtx | 3 ---
l3build/l3build.lua | 13 -------------
l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg | 2 +-
l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg | 2 +-
l3experimental/xcoffins/testfiles/xcoffins003.tlg | 2 +-
l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg | 2 +-
l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg | 2 +-
l3kernel/testfiles/m3ior002.tlg | 4 ++--
l3kernel/testfiles/m3msg004.luatex.tlg | 4 ++--
l3kernel/testfiles/m3msg004.tlg | 4 ++--
l3kernel/testfiles/m3tl002.tlg | 1 +
l3trial/l3htoks/testfiles/m3htoks001.tlg | 2 +-
l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg | 2 +-
l3trial/l3ldb/testfiles/m3ldb003.tlg | 2 +-
l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg | 2 +-
28 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/contrib/testfiles/chemformula001.ptex.tlg b/contrib/testfiles/chemformula001.ptex.tlg
index 01a3f1b..adae75c 100644
--- a/contrib/testfiles/chemformula001.ptex.tlg
+++ b/contrib/testfiles/chemformula001.ptex.tlg
@@ -440,4 +440,4 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
...\special{color pop}
-(.aux)
+(chemformula001.aux)
diff --git a/contrib/testfiles/chemformula001.tlg b/contrib/testfiles/chemformula001.tlg
index 45702c5..33a5e57 100644
--- a/contrib/testfiles/chemformula001.tlg
+++ b/contrib/testfiles/chemformula001.tlg
@@ -429,4 +429,4 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
...\pdfcolorstack 0 pop
-(.aux)
+(chemformula001.aux)
diff --git a/contrib/testfiles/chemformula001.uptex.tlg b/contrib/testfiles/chemformula001.uptex.tlg
index 01a3f1b..adae75c 100644
--- a/contrib/testfiles/chemformula001.uptex.tlg
+++ b/contrib/testfiles/chemformula001.uptex.tlg
@@ -440,4 +440,4 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
...\special{color pop}
-(.aux)
+(chemformula001.aux)
diff --git a/contrib/testfiles/chemformula001.xetex.tlg b/contrib/testfiles/chemformula001.xetex.tlg
index ae7cbe8..0e7e151 100644
--- a/contrib/testfiles/chemformula001.xetex.tlg
+++ b/contrib/testfiles/chemformula001.xetex.tlg
@@ -468,4 +468,4 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
...\special{color pop}
-(.aux)
+(chemformula001.aux)
diff --git a/contrib/testfiles/ctex002.luatex.tlg b/contrib/testfiles/ctex002.luatex.tlg
index 094a4ab..18607e2 100644
--- a/contrib/testfiles/ctex002.luatex.tlg
+++ b/contrib/testfiles/ctex002.luatex.tlg
@@ -85,4 +85,4 @@ Completed box being shipped out [1]
..\glue(\baselineskip) 30.0
..\hbox(0.0+0.0)x345.0, direction TLT
...\whatsit4=[]
-(.aux)
+(ctex002.aux)
diff --git a/contrib/testfiles/ctex002.tlg b/contrib/testfiles/ctex002.tlg
index c6a3120..ead09ce 100644
--- a/contrib/testfiles/ctex002.tlg
+++ b/contrib/testfiles/ctex002.tlg
@@ -95,4 +95,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 30.0
..\hbox(0.0+0.0)x345.0
-(.aux)
+(ctex002.aux)
diff --git a/contrib/testfiles/ctex002.xetex.tlg b/contrib/testfiles/ctex002.xetex.tlg
index cdf3bac..31fcbd7 100644
--- a/contrib/testfiles/ctex002.xetex.tlg
+++ b/contrib/testfiles/ctex002.xetex.tlg
@@ -57,4 +57,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.0001fil
..\glue(\baselineskip) 30.0
..\hbox(0.0+0.0)x345.0
-(.aux)
+(ctex002.aux)
diff --git a/contrib/testfiles/fontspec001.luatex.tlg b/contrib/testfiles/fontspec001.luatex.tlg
index 001f5a7..32bf4ac 100644
--- a/contrib/testfiles/fontspec001.luatex.tlg
+++ b/contrib/testfiles/fontspec001.luatex.tlg
@@ -43,4 +43,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\TU/lmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(.aux)
+(fontspec001.aux)
diff --git a/contrib/testfiles/fontspec001.xetex.tlg b/contrib/testfiles/fontspec001.xetex.tlg
index 25b089b..5fb998b 100644
--- a/contrib/testfiles/fontspec001.xetex.tlg
+++ b/contrib/testfiles/fontspec001.xetex.tlg
@@ -29,4 +29,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\TU/lmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(.aux)
+(fontspec001.aux)
diff --git a/contrib/testfiles/mhchem001.tlg b/contrib/testfiles/mhchem001.tlg
index c92f4ea..417e9d4 100644
--- a/contrib/testfiles/mhchem001.tlg
+++ b/contrib/testfiles/mhchem001.tlg
@@ -249,4 +249,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\OT1/cmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(.aux)
+(mhchem001.aux)
diff --git a/contrib/testfiles/siunitx001.tlg b/contrib/testfiles/siunitx001.tlg
index 2e42896..99e155b 100644
--- a/contrib/testfiles/siunitx001.tlg
+++ b/contrib/testfiles/siunitx001.tlg
@@ -360,4 +360,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\OT1/cmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(.aux)
+(siunitx001.aux)
diff --git a/contrib/testfiles/unicode-math001.luatex.tlg b/contrib/testfiles/unicode-math001.luatex.tlg
index bc02795..4e7745b 100644
--- a/contrib/testfiles/unicode-math001.luatex.tlg
+++ b/contrib/testfiles/unicode-math001.luatex.tlg
@@ -65,4 +65,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\TU/lmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(.aux)
+(unicode-math001.aux)
diff --git a/contrib/testfiles/unicode-math001.xetex.tlg b/contrib/testfiles/unicode-math001.xetex.tlg
index 15db656..db23013 100644
--- a/contrib/testfiles/unicode-math001.xetex.tlg
+++ b/contrib/testfiles/unicode-math001.xetex.tlg
@@ -61,4 +61,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\TU/lmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(.aux)
+(unicode-math001.aux)
diff --git a/l3build/l3build.dtx b/l3build/l3build.dtx
index 815d941..2214344 100644
--- a/l3build/l3build.dtx
+++ b/l3build/l3build.dtx
@@ -673,9 +673,6 @@
% \end{itemize}
% Modifications made in lines are:
% \begin{itemize}
-% \item Removal of the name of the test file itself.
-% \item Removal of the |pdftex.map| load information given during
-% first page shipout.
% \item Removal spaces at the start of lines.
% \item Removal of |./| at start of file names.
% \item Standardisation of the list of units known to \TeX{} (\pdfTeX{}
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index 952884e..f80e7d8 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -801,19 +801,6 @@ local function formatlog(logfile, newfile, engine)
end
local line = (lastline or "") .. line
lastline = ""
- -- Remove test file name from lines
- -- This needs to extract the base name from the log name,
- -- and one to allow for the case that there might be "-" chars
- -- in the name (other cases are ignored)
- line = gsub(
- line,
- gsub(
- match("/" .. logfile, ".*/(.*)%" .. logext .. "$"),
- "-",
- "%%-"
- ),
- ""
- )
-- Zap ./ at begin of filename
line = gsub(line, "%(%.%/", "(")
-- Zap paths if places other than 'here' are accessible
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
index 1a1fedf..d756288 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
@@ -887,5 +887,5 @@ TEST 3:
TEST 4:
============================================================
============================================================
-[2] (.aux)
+[2] (xcoffins003.aux)
LaTeX Font Warning: Some font shapes were not available, defaults substituted.
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
index 89ea80c..06f4f1e 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
@@ -811,4 +811,4 @@ TEST 3:
TEST 4:
============================================================
============================================================
-[2] (.aux)
+[2] (xcoffins003.aux)
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.tlg
index 6ae49e8..55b9716 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.tlg
@@ -803,4 +803,4 @@ TEST 3:
TEST 4:
============================================================
============================================================
-[2] (.aux)
+[2] (xcoffins003.aux)
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
index 89ea80c..06f4f1e 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
@@ -811,4 +811,4 @@ TEST 3:
TEST 4:
============================================================
============================================================
-[2] (.aux)
+[2] (xcoffins003.aux)
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
index 77446bf..3a30b75 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
@@ -803,5 +803,5 @@ TEST 3:
TEST 4:
============================================================
============================================================
-[2] (.aux)
+[2] (xcoffins003.aux)
LaTeX Font Warning: Some font shapes were not available, defaults substituted.
diff --git a/l3kernel/testfiles/m3ior002.tlg b/l3kernel/testfiles/m3ior002.tlg
index e955629..8e1cde8 100644
--- a/l3kernel/testfiles/m3ior002.tlg
+++ b/l3kernel/testfiles/m3ior002.tlg
@@ -5,12 +5,12 @@ Author: Bruno Le Floch
TEST 1: Mapping
============================================================
|\ExplSyntaxOff |
-|Thisfileisneededbym3file001.lvt,m3ior001.lvtand.lvt:|
+|Thisfileisneededbym3file001.lvt,m3ior001.lvtandm3ior002.lvt:|
|Pleaseleaveitalone!|
|\ExplSyntaxOn |
4 lines
|\ExplSyntaxOff|
-|This file is needed by m3file001.lvt, m3ior001.lvt and .lvt:|
+|This file is needed by m3file001.lvt, m3ior001.lvt and m3ior002.lvt:|
|Please leave it alone!|
|\ExplSyntaxOn|
4 lines
diff --git a/l3kernel/testfiles/m3msg004.luatex.tlg b/l3kernel/testfiles/m3msg004.luatex.tlg
index a91c9f8..22a899f 100644
--- a/l3kernel/testfiles/m3msg004.luatex.tlg
+++ b/l3kernel/testfiles/m3msg004.luatex.tlg
@@ -269,7 +269,7 @@ tex_end:D
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| Reading the current file '' will stop.
+| Reading the current file 'm3msg004' will stop.
|...............................................
tex_endinput:D
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -284,7 +284,7 @@ tex_endinput:D
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| Reading the current file '' will stop.
+| Reading the current file 'm3msg004' will stop.
|...............................................
tex_endinput:D
|msg_error:nnnnnn and msg_error:nnxxxx|
diff --git a/l3kernel/testfiles/m3msg004.tlg b/l3kernel/testfiles/m3msg004.tlg
index 50de43e..af43b4b 100644
--- a/l3kernel/testfiles/m3msg004.tlg
+++ b/l3kernel/testfiles/m3msg004.tlg
@@ -269,7 +269,7 @@ tex_end:D
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| Reading the current file '' will stop.
+| Reading the current file 'm3msg004' will stop.
|...............................................
tex_endinput:D
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -284,7 +284,7 @@ tex_endinput:D
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| Reading the current file '' will stop.
+| Reading the current file 'm3msg004' will stop.
|...............................................
tex_endinput:D
|msg_error:nnnnnn and msg_error:nnxxxx|
diff --git a/l3kernel/testfiles/m3tl002.tlg b/l3kernel/testfiles/m3tl002.tlg
index c7ce35a..6812d72 100644
--- a/l3kernel/testfiles/m3tl002.tlg
+++ b/l3kernel/testfiles/m3tl002.tlg
@@ -18,6 +18,7 @@ TEST 2: count (3/7/11)
============================================================
TEST 3: jobname
============================================================
+m3tl002
============================================================
============================================================
TEST 4: map_function
diff --git a/l3trial/l3htoks/testfiles/m3htoks001.tlg b/l3trial/l3htoks/testfiles/m3htoks001.tlg
index 178a0a2..a138d60 100644
--- a/l3trial/l3htoks/testfiles/m3htoks001.tlg
+++ b/l3trial/l3htoks/testfiles/m3htoks001.tlg
@@ -46,4 +46,4 @@ TEST 7: non-breakable space
Hello\penalty 10000 \ {}world!
============================================================
[2
-] (.aux)
+] (m3htoks001.aux)
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg b/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
index 6e33a53..7a1b589 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
@@ -27,7 +27,7 @@ LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enumer
LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerate
LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<enumerate*<enumerate
LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
-Dumping commands into (.dmp)
+Dumping commands into (m3ldb003.dmp)
\c_cs_dump_iow=\write3
commands . . . . . . . . . . . . . . . . . . . . . registers finished
LDB:
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.tlg b/l3trial/l3ldb/testfiles/m3ldb003.tlg
index 7b7379a..6c72833 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.tlg
@@ -27,7 +27,7 @@ LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enumer
LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerate
LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<enumerate*<enumerate
LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
-Dumping commands into (.dmp)
+Dumping commands into (m3ldb003.dmp)
\c_cs_dump_iow=\write3
commands . . . . . . . . . . . . . . . . . . . . . registers finished
LDB:
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg b/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
index d52c3c9..b16d224 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
@@ -27,7 +27,7 @@ LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enumer
LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerate
LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<enumerate*<enumerate
LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
-Dumping commands into (.dmp)
+Dumping commands into (m3ldb003.dmp)
\c_cs_dump_iow=\write3
commands . . . . . . . . . . . . . . . . . . . . . registers finished
LDB:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list