[latex3-commits] [git/LaTeX3-latex3-l3build] master: Avoid issues with TEXMFCNF expansion (aaa7ab0)

[Joseph Wright]

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

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

commit aaa7ab0ed700a71c239f1de8e3dd1b867786469a
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Sep 24 22:53:09 2018 +0100

    Avoid issues with TEXMFCNF expansion


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

aaa7ab0ed700a71c239f1de8e3dd1b867786469a
 l3build-check.lua       |    7 +------
 l3build-typesetting.lua |    5 +----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/l3build-check.lua b/l3build-check.lua
index 1c20067..556f326 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -30,9 +30,6 @@ local output           = io.output
 
 local rnd              = math.random
 
-local var_value        = kpse.var_value
-local set_program_name = kpse.set_program_name
-
 local luatex_version   = status.luatex_version
 
 local len              = string.len
@@ -729,8 +726,6 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
       break
     end
   end
-  -- Deal with TEXMFCNF
-  set_program_name("kpsewhich")
   -- Clean out any dynamic files
   for _,filetype in pairs(dynamicfiles) do
     rm(testdir,filetype)
@@ -747,7 +742,7 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
       os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
         .. os_concat ..
       -- Allow for local texmf files
-      os_setenv .. " TEXMFCNF=." .. os_pathsep .. var_value("TEXMFCNF")
+      os_setenv .. " TEXMFCNF=." .. os_pathsep
         .. os_concat ..
       (forcecheckepoch and setepoch() or "") ..
       -- Ensure lines are of a known length
diff --git a/l3build-typesetting.lua b/l3build-typesetting.lua
index 9f732f7..b9dbf19 100644
--- a/l3build-typesetting.lua
+++ b/l3build-typesetting.lua
@@ -29,9 +29,6 @@ for those people who are interested.
 local gsub             = string.gsub
 local match            = string.match
 
-local var_value        = kpse.var_value
-local set_program_name = kpse.set_program_name
-
 function dvitopdf(name, dir, engine, hide)
   if match(engine, "^u?ptex$") then
     run(
@@ -62,7 +59,7 @@ function runtool(subdir, dir, envvar, command)
       typesetdir .. "/" .. subdir,
       (forcedocepoch and setepoch() or "") ..
       -- Allow for local texmf files
-      os_setenv .. " TEXMFCNF=." .. os_pathsep .. var_value("TEXMFCNF")
+      os_setenv .. " TEXMFCNF=." .. os_pathsep
         .. os_concat ..
       os_setenv .. " " .. envvar .. "=." .. os_pathsep
         .. abspath(localdir) .. os_pathsep