[latex3-commits] [git/LaTeX3-latex3-l3build] master: Moved LuaTeX-specific font cache normalisation (319cf04)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/319cf04a82ce76ebabd86bb268684a0a25922a34

>---------------------------------------------------------------

commit 319cf04a82ce76ebabd86bb268684a0a25922a34
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Jun 18 14:30:36 2019 +0100

    Moved LuaTeX-specific font cache normalisation
    
    This should address a few issues on Travis-CI.


>---------------------------------------------------------------

319cf04a82ce76ebabd86bb268684a0a25922a34
 CHANGELOG.md      |    4 ++++
 l3build-check.lua |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20fde74..9b457be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ this project uses date-based 'snapshot' version identifiers.
 - Switch `--show-log-on-error` for use with `--halt-on-error`. Results in the `.log` file
   being show in full on the console to aid in non-interactive debugging.
 
+### Changed
+
+- Moved LuaTeX-specific font cache normalisation
+
 ## [2019-02-10]
 
 ### Fixed
diff --git a/l3build-check.lua b/l3build-check.lua
index 5e489df..301c0df 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -243,6 +243,9 @@ local function normalize_log(content,engine,errlevels)
        match(line, "^used structure  >") then
        return ""
     end
+    -- The first time a new font is used by LuaTeX, it shows up
+    -- as being cached: make it appear loaded every time
+    line = gsub(line, "save cache:", "load cache:")
     -- A tidy-up to keep LuaTeX and other engines in sync
     line = gsub(line, utf8_char(127), "^^?")
     -- Unicode engines display chars in the upper half of the 8-bit range:
@@ -345,9 +348,6 @@ local function normalize_lua_log(content,luatex)
         "Missing character: There is no (%^%^..) %(U%+(....)%)",
         "Missing character: There is no %1"
       )
-    -- The first time a new font is used, it shows up
-    -- as being cached
-    line = gsub(line, "(save cache:", "(load cache:")
     -- LuaTeX from v1.07 logs kerns differently ...
     -- This block only applies to the output of LuaTeX itself,
     -- hence needing a flag to skip the case of the reference log