[latex3-commits] [git/LaTeX3-latex3-latex2e] gh373: Avoid engine differences in tests (42132a2a)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh373
Link       : https://github.com/latex3/latex2e/commit/42132a2aab67b729ca5f72dbc875ee020eb299a3

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

commit 42132a2aab67b729ca5f72dbc875ee020eb299a3
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Thu Aug 20 18:05:22 2020 -0300

    Avoid engine differences in tests


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

42132a2aab67b729ca5f72dbc875ee020eb299a3
 base/testfiles/github-0373.lvt | 32 +++++++++++++++++++++-----------
 base/testfiles/github-0373.tlg | 25 ++++++++++++-------------
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/base/testfiles/github-0373.lvt b/base/testfiles/github-0373.lvt
index 166d4551..f77dae77 100644
--- a/base/testfiles/github-0373.lvt
+++ b/base/testfiles/github-0373.lvt
@@ -52,7 +52,8 @@
 \typeout{----- TeX}
 \show\foo
 \expandafter\show\csname foo \endcsname
-\expandafter\show\csname\string\foo\space\endcsname
+\expandafter\show\csname
+  \string\foo\space\endcsname
 
 \typeout{----------------------------------------}
 \DeclareRobustCommand*\foo[1]{bar}
@@ -69,42 +70,51 @@
 \typeout{----- TeX}
 \show\foo
 \expandafter\show\csname foo \endcsname
-\expandafter\show\csname\string\foo\space\endcsname
+\expandafter\show\csname
+  \string\foo\space\endcsname
 
 \typeout{----------------------------------------}
 
 \def\cmda{defined}
 
 % Here we need control words
-\test\cmda{\renewcommand\cmda[1][\zz]{boo}}
+\test\cmda{%
+  \renewcommand\cmda[1][\zz]{boo}}
 
-\test\cmdb{\DeclareRobustCommand\cmdb[1]{boo}}
+\test\cmdb{%
+  \DeclareRobustCommand\cmdb[1]{boo}}
 
-\test\cmdc{\DeclareRobustCommand\cmdc[1][\zz]{boo}}
+\test\cmdc{%
+  \DeclareRobustCommand\cmdc[1][\zz]{boo}}
 
 \test\cmdd{%
   \protected\edef\cmdd{\noexpand\@testopt
     \expandafter\noexpand\csname\string\cmdd\endcsname{}}%
-  \expandafter\def\csname\string\cmdd\endcsname[#1]{boo}}
+  \expandafter\def\csname
+    \string\cmdd\endcsname[#1]{boo}}
 
 % And here control symbols
-\test\!{\renewcommand\![1][\zz]{boo}}
+\test\!{%
+  \renewcommand\![1][\zz]{boo}}
 
-\test\#{\DeclareRobustCommand\#[1]{boo}}
+\test\#{%
+  \DeclareRobustCommand\#[1]{boo}}
 
-\test\${\DeclareRobustCommand\$[1][\zz]{boo}}
+\test\${%
+  \DeclareRobustCommand\$[1][\zz]{boo}}
 
 \test\%{%
   \protected\edef\%{\noexpand\@testopt
     \expandafter\noexpand\csname\string\%\endcsname{}}%
-  \expandafter\def\csname\string\%\endcsname[#1]{boo}}
+  \expandafter\def\csname
+    \string\%\endcsname[#1]{boo}}
 
 % Test letting other control sequences
 {%
  \def\testtt#1{%
    \typeout{\string#1=\meaning#1}%
    \let#1\undefined}%
- \test\cmda{\newcount\cmda}%
+ \test\cmda{\countdef\cmda187}%
 }
 
 \test\cmdb{\let\cmdb\undefined}
diff --git a/base/testfiles/github-0373.tlg b/base/testfiles/github-0373.tlg
index 31e0324b..e8987dc7 100644
--- a/base/testfiles/github-0373.tlg
+++ b/base/testfiles/github-0373.tlg
@@ -37,7 +37,7 @@ l. ...\expandafter\show\csname foo \endcsname
 > \\foo =\long macro:
 [#1]->bar.
 <recently read> \\foo  
-l. ......ter\show\csname\string\foo\space\endcsname
+l. ...  \string\foo\space\endcsname
 ----------------------------------------
 LaTeX Info: Redefining \foo on input line ....
 > \foo=robust macro:
@@ -76,7 +76,7 @@ l. ...\expandafter\show\csname foo \endcsname
 > \\foo =macro:
 [#1]->bar.
 <recently read> \\foo  
-l. ......ter\show\csname\string\foo\space\endcsname
+l. ...  \string\foo\space\endcsname
 ----------------------------------------
 > \cmda=robust macro:
 ->\@protected at testopt \cmda \\cmda {\zz }.
@@ -84,13 +84,13 @@ l. ......ter\show\csname\string\foo\space\endcsname
 > default #1=\zz .
 [#1]->boo.
 <recently read> }
-l. ...\test\cmda{\renewcommand\cmda[1][\zz]{boo}}
+l. ...  \renewcommand\cmda[1][\zz]{boo}}
 > \cmdb=robust macro:
 ->\protect \cmdb  .
 > \cmdb =\long macro:
 #1->boo.
 <argument> \cmdb  
-l. ......t\cmdb{\DeclareRobustCommand\cmdb[1]{boo}}
+l. ...  \DeclareRobustCommand\cmdb[1]{boo}}
 > \cmdc=robust macro:
 ->\protect \cmdc  .
 > \cmdc =robust macro:
@@ -99,25 +99,25 @@ l. ......t\cmdb{\DeclareRobustCommand\cmdb[1]{boo}}
 > default #1=\zz .
 [#1]->boo.
 <recently read> }
-l. ......c{\DeclareRobustCommand\cmdc[1][\zz]{boo}}
+l. ...  \DeclareRobustCommand\cmdc[1][\zz]{boo}}
 > \cmdd=\protected macro:
 ->\@testopt \\cmdd {}.
 <argument> \cmdd 
-l. ......def\csname\string\cmdd\endcsname[#1]{boo}}
+l. ...    \string\cmdd\endcsname[#1]{boo}}
 > \!=robust macro:
 ->\@protected at testopt \!\\! {\zz }.
 > \\!=\long macro:
 > default #1=\zz .
 [#1]->boo.
 <recently read> }
-l. ...\test\!{\renewcommand\![1][\zz]{boo}}
+l. ...  \renewcommand\![1][\zz]{boo}}
 LaTeX Info: Redefining \# on input line ....
 > \#=robust macro:
 ->\x at protect \#\protect \#  .
 > \# =\long macro:
 #1->boo.
 <argument> \#  
-l. ...\test\#{\DeclareRobustCommand\#[1]{boo}}
+l. ...  \DeclareRobustCommand\#[1]{boo}}
 LaTeX Info: Redefining \$ on input line ....
 > \$=robust macro:
 ->\x at protect \$\protect \$  .
@@ -127,16 +127,15 @@ LaTeX Info: Redefining \$ on input line ....
 > default #1=\zz .
 [#1]->boo.
 <recently read> }
-l. ...\test\${\DeclareRobustCommand\$[1][\zz]{boo}}
+l. ...  \DeclareRobustCommand\$[1][\zz]{boo}}
 > \%=\protected macro:
 ->\@testopt \\% {}.
 <argument> \%
-l. ......r\def\csname\string\%\endcsname[#1]{boo}}
-\cmda=\count...
+l. ...    \string\%\endcsname[#1]{boo}}
 > \cmda=\count187.
 <argument> \cmda 
-l. ... \test\cmda{\newcount\cmda}
-                                 %
+l. ... \test\cmda{\countdef\cmda187}
+                                    %
 > \cmdb=undefined.
 <argument> \cmdb 
 l. ...\test\cmdb{\let\cmdb\undefined}