[latex3-commits] [git/LaTeX3-latex3-l3build] master: Simplify some set up (678d6dc)

[Joseph Wright]

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

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

commit 678d6dc6d0ab45a91047b1c4bf6f6e999d51cf00
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Oct 18 09:29:59 2018 +0100

    Simplify some set up


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

678d6dc6d0ab45a91047b1c4bf6f6e999d51cf00
 l3build-check.lua |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/l3build-check.lua b/l3build-check.lua
index 897b462..a4451c2 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -678,17 +678,15 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
     not match(engine, checkformat) then
     format = " -fmt=" .. gsub(engine, "(.*)tex$", "%1") .. checkformat
   end
-  -- Special casing for e-LaTeX format
-  if
-    match(checkformat, "^latex$") and
-    match(engine, "^etex$") then
-    format = " -fmt=latex"
-  end
-  -- Special casing for (u)pTeX LaTeX formats
-  if
-    match(checkformat, "^latex$") and
-    match(engine, "^u?ptex$") then
-    realengine = "e" .. engine
+  if checkformat == "latex" then
+    -- Special case for e-LaTeX format
+    if engine == "etex" then
+      format = " -fmt=latex"
+    end
+    -- Special case for (u)pTeX LaTeX
+    if match(engine,"^u?ptex$") then
+      realengine = "e" .. engine
+    end
   end
   -- Special casing for XeTeX engine
   local checkopts = checkopts