[latex3-commits] [git/LaTeX3-latex3-l3build] master: Set `testsuppdir` when multiple configurations are used (afac4e1)

[Joseph Wright]

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

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

commit afac4e1f3c82d1939e083390569d03cf475e0e85
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Nov 1 19:25:24 2019 +0000

    Set `testsuppdir` when multiple configurations are used
    
    Shows up in removing e-TeX from some tests ..


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

afac4e1f3c82d1939e083390569d03cf475e0e85
 CHANGELOG.md                          | 4 ++++
 l3build.lua                           | 6 ++++++
 testfiles/support/regression-test.cfg | 7 ++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c205391..42291c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ this project uses date-based 'snapshot' version identifiers.
 - Extend `runtest_task()` to pass run number
 - Allow `regression-test` to load when e-TeX is unavailable (fixes #105)
 
+### Fixed
+
+- Location of `testsuppdir` when multiple configurations are used
+
 ## [2019-10-02]
 
 ### Added
diff --git a/l3build.lua b/l3build.lua
index d9f4fe2..aad1391 100755
--- a/l3build.lua
+++ b/l3build.lua
@@ -177,8 +177,14 @@ if #checkconfigs == 1 and
    (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then
    local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua"
    if fileexists(config) then
+     local savedtestfiledir = testfiledir
      dofile(config)
      testdir = testdir .. "-" .. checkconfigs[1]
+     -- Reset testsuppdir if required
+     if savedtestfiledir ~= testfiledir and
+       testsuppdir == savedtestfiledir .. "/support" then
+       testsuppdir = testfiledir .. "/support"
+     end
    else
      print("Error: Cannot find configuration " ..  checkconfigs[1])
      exit(1)
diff --git a/testfiles/support/regression-test.cfg b/testfiles/support/regression-test.cfg
index 0d19f02..32f4c50 100644
--- a/testfiles/support/regression-test.cfg
+++ b/testfiles/support/regression-test.cfg
@@ -47,11 +47,6 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\def\ISCFGLOADED{\SEPARATOR\TYPE{CFG FILE IS LOADED}\SEPARATOR}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname protected\endcsname\relax
-  \expandafter\endinput
-\fi
 \ifx\RequirePackage\@undefined\else
   \OMIT
   \RequirePackage{etex}
@@ -83,6 +78,8 @@
 \regression at test@alloc {30} \newmuskip
 \regression at test@alloc {30} \newskip
 
+\def\ISCFGLOADED{\SEPARATOR\TYPE{CFG FILE IS LOADED}\SEPARATOR}
+
 %%
 %%
 %% End of file `regression-test-l3.cfg'.