[jhalfs] branch trunk updated: Fix generation of test instructions

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new a4a8cc8  Fix generation of test instructions
a4a8cc8 is described below

commit a4a8cc86b547c4f00e90c7a0cb50304a2f286cb4
Author: Pierre Labastie <[email protected]>
AuthorDate: Wed Feb 5 10:31:42 2025 +0100

    Fix generation of test instructions
    
    There was a wrong logic so that lines conatining "make" where not
    tested for a continuation character. Also lines containing '&>'
    were not tested at all so that output was redirected to
    $TEST_LOG while not output was expected.
    A special case is added for vim to keep the log in $TEST_LOG
---
 LFS/lfs.xsl | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 0452aa4..648b541 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -1151,33 +1151,33 @@ LOGLEVEL="</xsl:text>
         <xsl:choose>
           <xsl:when test="contains(string(), 'make -k')">
             <xsl:value-of select="$instructions"/>
-            <xsl:if test="not($eof-seen)">
-              <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
-            </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
           </xsl:when>
           <xsl:when test="contains($instructions, 'make')">
             <xsl:value-of select="substring-before($instructions, 'make')"/>
             <xsl:text>make -k</xsl:text>
             <xsl:value-of select="substring-after($instructions, 'make')"/>
-            <xsl:if test="not($eof-seen)">
-              <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
-            </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="$instructions"/>
-            <xsl:if
-              test="not(contains($instructions, '&gt;&gt;')) and
-                    not(contains($instructions, '&gt; /')) and
-                    not($eof-seen) and
-                    substring($instructions,
-                              string-length($instructions)) != '\'">
-              <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
-            </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="$eof-seen or
+                substring($instructions,
+                string-length($instructions)) = '\'"/><!-- do nothing -->
+          <xsl:when test="contains($instructions, '&gt;&gt;') or
+                          contains($instructions, '&amp;&gt;')">
+            <xsl:text> || true</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:text>&#xA;</xsl:text>
+        <xsl:if test="contains($instructions,'vim-test.log')">
+          <xsl:text>cat vim-test.log &gt;&gt; $TEST_LOG
+</xsl:text>
+        </xsl:if>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page