[latex3-commits] [git/LaTeX3-latex3-l3build] master: Set LUAINPUTS (890cfa9)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/890cfa9865fb2d4f2c0d3e95e6c784176b0f4b56

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

commit 890cfa9865fb2d4f2c0d3e95e6c784176b0f4b56
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Aug 23 23:02:11 2019 +0100

    Set LUAINPUTS


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

890cfa9865fb2d4f2c0d3e95e6c784176b0f4b56
 CHANGELOG.md            | 6 +++++-
 l3build-check.lua       | 2 ++
 l3build-typesetting.lua | 2 +-
 l3build-unpack.lua      | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55c14f3..5c8771c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,11 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
-## Fixed
+### Changed
+
+- Include `LUAINPUTS` when setting `TEXINPUTS` for `checksearch = false`, etc.
+
+### Fixed
 
 - Remove `.log` file before each check run: prevent inter-engine confusion
 
diff --git a/l3build-check.lua b/l3build-check.lua
index 2874452..c05defc 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -725,6 +725,8 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
       -- avoids any paths in the logs
       os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "")
         .. os_concat ..
+      os_setenv .. " LUAINPUTS=." .. (checksearch and os_pathsep or "")
+        .. os_concat ..
       -- Avoid spurious output from (u)pTeX
       os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
         .. os_concat ..
diff --git a/l3build-typesetting.lua b/l3build-typesetting.lua
index 5133d08..eb2974c 100644
--- a/l3build-typesetting.lua
+++ b/l3build-typesetting.lua
@@ -127,7 +127,7 @@ function tex(file,dir)
   local dir = dir or "."
   return runcmd(typesetexe .. " " .. typesetopts .. " \"" .. typesetcmds
     .. "\\input " .. file .. "\"",
-    dir,{"TEXINPUTS"})
+    dir,{"TEXINPUTS","LUAINPUTS"})
 end
 
 local function typesetpdf(file,dir)
diff --git a/l3build-unpack.lua b/l3build-unpack.lua
index 9779502..8f85f42 100644
--- a/l3build-unpack.lua
+++ b/l3build-unpack.lua
@@ -85,6 +85,8 @@ bundleunpack = bundleunpack or function(sourcedirs, sources)
         unpackdir .. "/" .. path,
         os_setenv .. " TEXINPUTS=." .. os_pathsep
           .. localdir .. (unpacksearch and os_pathsep or "") ..
+        os_setenv .. " LUAINPUTS=." .. os_pathsep
+          .. localdir .. (unpacksearch and os_pathsep or "") ..
         os_concat ..
         unpackexe .. " " .. unpackopts .. " " .. name .. " < "
           .. localdir .. "/yes"