[latex3-commits] [git/LaTeX3-latex3-l3build] master: Allow regression-test.tex to work without e-TeX (fixes #105) (b932752)

[Joseph Wright]

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

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

commit b932752e4a80de403cc761f33ef8b3fd2e5e78a7
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Nov 1 18:03:45 2019 +0000

    Allow regression-test.tex to work without e-TeX (fixes #105)
    
    We loose \SHOWFILES but everything else still works.


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

b932752e4a80de403cc761f33ef8b3fd2e5e78a7
 CHANGELOG.md |  1 +
 l3build.dtx  | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b827d8..c205391 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ this project uses date-based 'snapshot' version identifiers.
   (fixes #103)
 - Normalise Lua data references (#107)
 - Extend `runtest_task()` to pass run number
+- Allow `regression-test` to load when e-TeX is unavailable (fixes #105)
 
 ## [2019-10-02]
 
diff --git a/l3build.dtx b/l3build.dtx
index 5a75183..d4f8b1e 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -2036,12 +2036,11 @@
 %
 % \subsection{Preliminaries}
 %
-% We require \eTeX{}.
+% We require \eTeX{} for some features.
 %    \begin{macrocode}
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname eTeXversion\endcsname\relax
-  \errmessage{e-TeX is required to use regression-test.tex}%
-  \expandafter\endinput
+  \message{e-TeX is required by some regression-test.tex features}%
 \fi
 %    \end{macrocode}
 %
@@ -2163,7 +2162,14 @@
 \def\OMIT{\LONGTYPEOUT{OMIT}}
 \def\TIMO{\LONGTYPEOUT{TIMO}}
 %    \end{macrocode}
-% \end{macro}
+% \end{macro}% We require \eTeX{}.
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+  \errmessage{e-TeX is required to use regression-test.tex}%
+  \expandafter\endinput
+\fi
+%    \end{macrocode}
 %
 %  \begin{macro}{\SHOWFILE}
 %     Load a file (e.g.,| \jobname.toc|) into the .log file with the usual special
@@ -2186,6 +2192,10 @@
      \typeout{-------- #1 (end) -----------}%
 }%
 \endgroup
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname \everyeof\endcsname\relax
+  \def\SHOWFILE#1{\TYPE{FEATURE UNAVAILABLE}}
+\fi
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -2240,7 +2250,7 @@
     ============================================================%
   }%
 }
-\protected\long\def\BEGINTEST#1{%
+\csname protected\endcsname\long\def\BEGINTEST#1{%
   \global\advance\gTESTint by 1 %
   \SEPARATOR
   \LONGTYPEOUT{TEST \the\gTESTint: \detokenize{#1}}%
@@ -2248,7 +2258,7 @@
   \begingroup
     \let\TYPE\LONGTYPEOUT
 }
-\protected\long\def\ENDTEST{%
+\csname protected\endcsname\long\def\ENDTEST{%
   \endgroup
   \SEPARATOR
   \LONGTYPEOUT{}%
@@ -2367,6 +2377,10 @@
 %
 % Finish up.
 %    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname protected\endcsname\relax
+  \let\protected\undefined
+\fi
 \reset at catcodes
 %    \end{macrocode}
 %