From 2ba06c139c46208f03d24e06963bbdc3db72f4b1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 Nov 2019 21:08:17 +0000 Subject: l3build (2nov19) git-svn-id: svn://tug.org/texlive/trunk@52619 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3build/regression-test.tex | 115 ++++++++++++++++----- 1 file changed, 89 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3build') diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex index 22d2f0a2c0a..fc77a4da7df 100644 --- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex +++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex @@ -20,8 +20,7 @@ %% \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 \ifx\unprotect\undefined \expandafter\edef\csname reset\string @catcodes\endcsname{% @@ -32,7 +31,11 @@ \unprotect \def\reset@catcodes{\protect}% \fi -\ifnum\interactionmode>1 \scrollmode\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname interactionmode\endcsname\relax +\else + \ifnum\interactionmode>1 \scrollmode\fi +\fi \errorcontextlines=-1 % \showboxbreadth=\maxdimen \showboxdepth=\maxdimen @@ -73,6 +76,13 @@ \LONGTYPEOUT{^^JEND-TEST-LOG^^J}% \@@@end } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname currentgrouplevel\endcsname\relax + \def\END{% + \LONGTYPEOUT{^^JEND-TEST-LOG^^J}% + \@@@end + } +\fi \ifx\@@end\@undefined \let\end\END \else @@ -80,7 +90,6 @@ \fi \def\OMIT{\LONGTYPEOUT{OMIT}} \def\TIMO{\LONGTYPEOUT{TIMO}} - \begingroup % within the scope of this groups each line needs to end in % ! \catcode`\^^M\active % \gdef\SHOWFILE#1{% @@ -98,6 +107,10 @@ \typeout{-------- #1 (end) -----------}% }% \endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname everyeof\endcsname\relax + \def\SHOWFILE#1{\TYPE{FEATURE UNAVAILABLE}} +\fi \ifx\InputIfFileExists\@undefined \newread\@inputcheck \long\def\InputIfFileExists#1#2#3{% @@ -119,7 +132,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}}% @@ -127,7 +140,21 @@ \begingroup \let\TYPE\LONGTYPEOUT } -\protected\long\def\ENDTEST{% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \long\def\BEGINTEST#1{% + \global\advance\gTESTint by 1 % + \SEPARATOR + \begingroup + \toks0={#1}% + \LONGTYPEOUT{TEST \the\gTESTint: \the\toks0 }% + \endgroup + \SEPARATOR + \begingroup + \let\TYPE\LONGTYPEOUT + } +\fi +\csname protected\endcsname\long\def\ENDTEST{% \endgroup \SEPARATOR \LONGTYPEOUT{}% @@ -147,6 +174,62 @@ \def \YES {\TYPE{YES}} \def \NO {\TYPE{NO}} \def \NEWLINE {\TYPE{^^J}} +\csname protected\endcsname\long\def\ASSERT#1#2{% + \begingroup + \edef\@tempa{#1}% + \edef\@tempb{#2}% + \ifx\@tempa\@tempb + \TYPE{PASSED}% + \else + \TYPE{FAILED}% + \fi + \endgroup +} +\csname protected\endcsname\long\def\ASSERTSTR#1#2{% + \begingroup + \edef\@tempa{#1}% + \edef\@tempb{#2}% + \edef\@tempa{\detokenize\expandafter{\@tempa}}% + \edef\@tempb{\detokenize\expandafter{\@tempb}}% + \ifx\@tempa\@tempb + \TYPE{PASSED}% + \else + \TYPE{FAILED}% + \fi + \endgroup +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \long\def\ASSERTSTR#1#2{% + \TYPE{FEATURE UNAVAILABLE}% + } +\fi +\ifnum 0% + \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi + \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi + >0 % + \ifx\pdfvariable\@undefined + \pdfcompresslevel=0 % + \pdfobjcompresslevel=0 % + \else + \pdfvariable compresslevel=0 % + \pdfvariable objcompresslevel=0 % + \fi +\else + \ifnum 0% + \ifx\XeTeXversion\@undefined\else 1\fi + \ifx\kanjiskip\@undefined\else 1\fi + >0 % + \special{dvipdfmx:config z 0}% Compress level + \special{dvipdfmx:config C 0x40}% Object compression + \fi +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax + \reset@catcodes + \let\protected\undefined + \expandafter\endinput +\fi \ifx\pdfoutput\@undefined \ifx\outputmode\@undefined \else @@ -201,26 +284,6 @@ } \fi \fi -\ifnum 0% - \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi - \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi - >0 % - \ifx\pdfvariable\@undefined - \pdfcompresslevel=0 % - \pdfobjcompresslevel=0 % - \else - \pdfvariable compresslevel=0 % - \pdfvariable objcompresslevel=0 % - \fi -\else - \ifnum 0% - \ifx\XeTeXversion\@undefined\else 1\fi - \ifx\kanjiskip\@undefined\else 1\fi - >0 % - \special{dvipdfmx:config z 0}% Compress level - \special{dvipdfmx:config C 0x40}% Object compression - \fi -\fi \reset@catcodes %% %% -- cgit v1.2.3