3 files changed, 6 insertions, 14 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 1c20067d9b6..556f326cd70 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/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/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index 9f732f7fab4..6ce80cdf7a3 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/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(
@@ -55,14 +52,13 @@ end
 
 -- An auxiliary used to set up the environmental variables
 function runtool(subdir, dir, envvar, command)
-  set_program_name("kpsewhich")
   dir = dir or "."
   return(
     run(
       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
@@ -254,3 +250,4 @@ function doc(files)
   end
   return 0
 end
+
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 827d3856a74..cdf1dead187 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2018-09-23"
+release_date = "2018-09-26"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
@@ -140,8 +140,8 @@ if options["target"] == "check" then
       for _,config in ipairs(failed) do
         print("Failed tests for configuration " .. config .. ":")
         print("\n  Check failed with difference files")
-        if failed ~= "build" then
-          local testdir = testdir .. "-" .. failed
+        if config ~= "build" then
+          local testdir = testdir .. "-" .. config
         end
         for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do
           print("  - " .. testdir .. "/" .. i)