r2358 - jhalfs/branches/experimental/HLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Mar 17 12:53:55 PST 2006


Author: manuel
Date: 2006-03-17 13:53:55 -0700 (Fri, 17 Mar 2006)
New Revision: 2358

Modified:
   jhalfs/branches/experimental/HLFS/hlfs.xsl
Log:
Fixed Binutils and GCC chapter06 testsuites.

Modified: jhalfs/branches/experimental/HLFS/hlfs.xsl
===================================================================
--- jhalfs/branches/experimental/HLFS/hlfs.xsl	2006-03-17 20:49:18 UTC (rev 2357)
+++ jhalfs/branches/experimental/HLFS/hlfs.xsl	2006-03-17 20:53:55 UTC (rev 2358)
@@ -122,10 +122,17 @@
             ($testsuite = '2' and
             ancestor::chapter[@id='chapter-building-system']) or
             $testsuite = '3')">
-      <xsl:value-of select="substring-before(string(),'make')"/>
-      <xsl:text>make -k</xsl:text>
-      <xsl:value-of select="substring-after(string(),'make')"/>
-      <xsl:text> || true&#xA;</xsl:text>
+      <xsl:choose>
+        <xsl:when test="ancestor::sect1[@id='ch-system-gcc']">
+          <xsl:text>make -k check || true&#xA;</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="substring-before(string(),'make')"/>
+          <xsl:text>make -k</xsl:text>
+          <xsl:value-of select="substring-after(string(),'make')"/>
+          <xsl:text> || true&#xA;</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
   </xsl:template>
 
@@ -187,6 +194,9 @@
           </xsl:when>
         </xsl:choose>
       </xsl:when>
+      <xsl:when test="contains(string(),'hardened-specs') and
+                ancestor::sect1[@id='ch-system-binutils']
+                and $testsuite = '0'"/>
       <!-- Don't stop on strip run -->
       <xsl:when test="contains(string(),'strip ')">
         <xsl:apply-templates/>




More information about the alfs-log mailing list