[latex3-commits] [git/LaTeX3-latex3-l3build] main: Use runcmd in dvitopdf to allow for local texmf (#262) (e36f95c)

[GitHub]

Repository : https://github.com/latex3/l3build
On branch  : main
Link       : https://github.com/latex3/l3build/commit/e36f95c47b02d34ab6f3db8bb3c44b00bbca10b4

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

commit e36f95c47b02d34ab6f3db8bb3c44b00bbca10b4
Author: teatimeguest <teatimeguest at gmail.com>
Date:   Thu Jan 12 03:45:16 2023 +0900

    Use runcmd in dvitopdf to allow for local texmf (#262)


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

e36f95c47b02d34ab6f3db8bb3c44b00bbca10b4
 CHANGELOG.md            |  3 +++
 l3build-check.lua       | 10 +++-------
 l3build-typesetting.lua | 23 +++++++++++------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700a00e..194376a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Ensure `texmf.cnf` work correctly for `dvips`
+
 ## [2022-11-10]
 
 ### Changed
diff --git a/l3build-check.lua b/l3build-check.lua
index 7b3191a..a24e598 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -778,8 +778,7 @@ function runtest(name, engine, hide, ext, test_type, breakout)
   rmfile(testdir,name .. logext)
   local errlevels = {}
   for i = 1, checkruns do
-    errlevels[i] = run(
-      testdir,
+    errlevels[i] = runcmd(
       -- No use of localdir here as the files get copied to testdir:
       -- avoids any paths in the logs
       os_setenv .. " TEXINPUTS=." .. localtexmf()
@@ -791,10 +790,6 @@ function runtest(name, engine, hide, ext, test_type, breakout)
       -- Avoid spurious output from (u)pTeX
       os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
         .. os_concat ..
-      -- Allow for local texmf files
-      os_setenv .. " TEXMFCNF=." .. os_pathsep
-        .. os_concat ..
-      set_epoch_cmd(epoch, forcecheckepoch) ..
       -- Ensure lines are of a known length
       os_setenv .. " max_print_line=" .. maxprintline
         .. os_concat ..
@@ -803,7 +798,8 @@ function runtest(name, engine, hide, ext, test_type, breakout)
         .. setup(lvtfile)
         .. (hide and (" > " .. os_null) or "")
         .. os_concat ..
-      runtest_tasks(jobname(lvtfile),i)
+      runtest_tasks(jobname(lvtfile),i),
+      testdir
     )
     -- Break the loop if the result is stable
     if breakout and i < checkruns then
diff --git a/l3build-typesetting.lua b/l3build-typesetting.lua
index c173b25..7f5327b 100644
--- a/l3build-typesetting.lua
+++ b/l3build-typesetting.lua
@@ -35,18 +35,6 @@ local match = string.match
 
 local os_type = os.type
 
-function dvitopdf(name, dir, engine, hide)
-  run(
-    dir,
-    set_epoch_cmd(epoch, forcecheckepoch) ..
-    "dvips " .. name .. dviext
-      .. (hide and (" > " .. os_null) or "")
-      .. os_concat ..
-    "ps2pdf " .. ps2pdfopt .. name .. psext
-      .. (hide and (" > " .. os_null) or "")
-  )
-end
-
 -- An auxiliary used to set up the environmental variables
 function runcmd(cmd,dir,vars)
   dir = dir or "."
@@ -67,6 +55,17 @@ function runcmd(cmd,dir,vars)
   return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. os_concat .. cmd)
 end
 
+function dvitopdf(name, dir, engine, hide)
+  runcmd(
+    "dvips " .. name .. dviext
+      .. (hide and (" > " .. os_null) or "")
+      .. os_concat ..
+    "ps2pdf " .. ps2pdfopt .. name .. psext
+      .. (hide and (" > " .. os_null) or ""),
+    dir
+  )
+end
+
 function biber(name,dir)
   if fileexists(dir .. "/" .. name .. ".bcf") then
     return