r3348 - jhalfs/trunk/LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Apr 13 10:31:41 PDT 2007


Author: manuel
Date: 2007-04-13 11:31:41 -0600 (Fri, 13 Apr 2007)
New Revision: 3348

Modified:
   jhalfs/trunk/LFS/lfs.xsl
Log:
LFS: Fixed Bash testsuite run.

Modified: jhalfs/trunk/LFS/lfs.xsl
===================================================================
--- jhalfs/trunk/LFS/lfs.xsl	2007-04-06 21:09:04 UTC (rev 3347)
+++ jhalfs/trunk/LFS/lfs.xsl	2007-04-13 17:31:41 UTC (rev 3348)
@@ -177,18 +177,21 @@
         <xsl:text>make mrproper&#xA;</xsl:text>
         <xsl:text>cp -v ../kernel-config .config&#xA;</xsl:text>
       </xsl:when>
-      <!-- The Coreutils and Module-Init-Tools test suites are optional -->
+      <!-- The Bash, Coreutils, and Module-Init-Tools test suites are optional -->
       <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or
-                ancestor::sect1[@id='ch-system-module-init-tools']) and
-                (contains(string(),'check') or
-                contains(string(),'dummy'))">
+                       ancestor::sect1[@id='ch-system-bash'] or
+                       ancestor::sect1[@id='ch-system-module-init-tools']) and
+                      (contains(string(),'check') or contains(string(),'nobody')
+                       or contains(string(),'dummy'))">
         <xsl:choose>
           <xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
           <xsl:otherwise>
-            <xsl:if test="not(contains(string(),'check'))">
+            <xsl:if test="not(contains(string(),'check')) and
+                          not(contains(string(),'tests'))">
               <xsl:apply-templates/>
               <xsl:text>&#xA;</xsl:text>
             </xsl:if>
+            <!-- Coreutils and Module-Init-Tools -->
             <xsl:if test="contains(string(),'check')">
               <xsl:choose>
                 <xsl:when test="$bomb-testsuite = 'n'">
@@ -207,6 +210,25 @@
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:if>
+            <!-- Bash -->
+            <xsl:if test="contains(string(),'tests')">
+              <xsl:choose>
+                <xsl:when test="$bomb-testsuite = 'n'">
+                  <xsl:value-of select="substring-before(string(),'tests')"/>
+                  <xsl:text>-k tests</xsl:text>
+                  <xsl:value-of select="substring-after(string(),'tests')"/>
+                  <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates/>
+                  <xsl:text> >> $TEST_LOG 2>&1</xsl:text>
+                  <xsl:if test="contains(string(),' -k ')">
+                    <xsl:text> || true</xsl:text>
+                  </xsl:if>
+                  <xsl:text>&#xA;</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>




More information about the alfs-log mailing list