[jhalfs] 02/02: tests in BLFS: Prevent adding "-k" to non "make" command

This is a multi-part message in MIME format...

------------=_1773308529-32719-14951
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

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

git pushed a commit to branch trunk
in repository jhalfs.

commit 057a3125b5ef282e2d38d2fe6ab33089b2c60cfc
Author: Pierre Labastie <[email protected]>
AuthorDate: Thu Mar 12 10:38:03 2026 +0100

    tests in BLFS: Prevent adding "-k" to non "make" command
    
    When running tests, we add -k to any make command, to be able to
    collect as many logs as possible. But this is wrong when a test
    command contains for example "cmake". So refine the test to
    eliminate those cases (note that the test is still lacking
    some cases (command containing both cmake and make for
    example).
---
 BLFS/xsl/process-install.xsl | 5 +++--
 BLFS/xsl/scripts.xsl         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BLFS/xsl/process-install.xsl b/BLFS/xsl/process-install.xsl
index 87841eb..96515d6 100644
--- a/BLFS/xsl/process-install.xsl
+++ b/BLFS/xsl/process-install.xsl
@@ -404,8 +404,9 @@ echo Size after install: $(sudo du -skx --exclude home $BUILD_DIR) >> $INFOLOG
           <xsl:text>#</xsl:text>
         </xsl:if>
         <xsl:choose>
-          <xsl:when test="contains($test-instr,'make')
-                  and not(contains($test-instr,'make -k'))">
+          <xsl:when test="contains($test-instr,' make ')
+                    or starts-with($test-instr,'make ')
+                  and not(contains($test-instr,'-k'))">
             <xsl:copy-of select="substring-before($test-instr,'make')"/>
             <xsl:text>make -k</xsl:text>
             <xsl:copy-of select="substring-after($test-instr,'make')"/>
diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index 32c1613..c501cc9 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -806,7 +806,7 @@ echo Time before test: ${SECONDS} >> $INFOLOG
       </xsl:otherwise>
     </xsl:choose>
     <xsl:choose>
-      <xsl:when test="contains($ns,'make')">
+      <xsl:when test="starts-with($ns, 'make ') or contains($ns,' make ')">
         <xsl:value-of select="substring-before($ns,'make ')"/>
         <xsl:text>make </xsl:text>
         <xsl:if test="not(contains($ns,'-k'))">

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

------------=_1773308529-32719-14951
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

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