r2883 - in jhalfs/branches/1.0: CLFS HLFS LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Aug 5 08:11:08 PDT 2006


Author: manuel
Date: 2006-08-05 09:11:06 -0600 (Sat, 05 Aug 2006)
New Revision: 2883

Modified:
   jhalfs/branches/1.0/CLFS/clfs.xsl
   jhalfs/branches/1.0/HLFS/hlfs.xsl
   jhalfs/branches/1.0/LFS/lfs.xsl
   jhalfs/branches/1.0/common/common-functions
   jhalfs/branches/1.0/common/config
   jhalfs/branches/1.0/common/func_validate_configs.sh
Log:
Ported r2882 from trunk.

Modified: jhalfs/branches/1.0/CLFS/clfs.xsl
===================================================================
--- jhalfs/branches/1.0/CLFS/clfs.xsl	2006-08-05 14:51:11 UTC (rev 2882)
+++ jhalfs/branches/1.0/CLFS/clfs.xsl	2006-08-05 15:11:06 UTC (rev 2883)
@@ -23,9 +23,16 @@
        0 = none
        1 = only Glibc, GCC and Binutils testsuites
        2 = all testsuites
-       3 = alias to 2 -->
+       3 = alias to 2
+  -->
   <xsl:param name="testsuite" select="1"/>
 
+  <!-- Bomb on test suites failures?
+       0 = no, I want to build the full system and review the logs
+       1 = yes, bomb at the first test suite failure to can review the build dir
+  -->
+  <xsl:param name="bomb-testsuite" select="0"/>
+
   <!-- Install vim-lang package? -->
   <xsl:param name="vim-lang" select="1"/>
 
@@ -117,10 +124,18 @@
     <xsl:if test="(contains(string(),'test') or
             contains(string(),'check')) and
             ($testsuite = '2' 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> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+      <xsl:choose>
+        <xsl:when test="$bomb-testsuite = '0'">
+          <xsl:value-of select="substring-before(string(),'make')"/>
+          <xsl:text>make -k</xsl:text>
+          <xsl:value-of select="substring-after(string(),'make')"/>
+          <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+          <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
   </xsl:template>
 
@@ -172,11 +187,24 @@
         <xsl:choose>
           <xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
           <xsl:otherwise>
-            <xsl:apply-templates/>
+            <xsl:if test="not(contains(string(),'check'))">
+              <xsl:apply-templates/>
+              <xsl:text>&#xA;</xsl:text>
+            </xsl:if>
             <xsl:if test="contains(string(),'check')">
-              <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text>
+              <xsl:choose>
+                <xsl:when test="$bomb-testsuite = '0'">
+                  <xsl:value-of select="substring-before(string(),'check')"/>
+                  <xsl:text>-k check</xsl:text>
+                  <xsl:value-of select="substring-after(string(),'check')"/>
+                  <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates/>
+                  <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
@@ -185,7 +213,15 @@
                 string() = 'make -k check'">
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
-            <xsl:text>make -k check >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+            <xsl:choose>
+              <xsl:when test="$bomb-testsuite = '0'">
+                <xsl:text>make -k check >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:apply-templates/>
+                <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:when>
         </xsl:choose>
       </xsl:when>
@@ -193,7 +229,14 @@
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
             <xsl:value-of select="substring-before(string(),'>g')"/>
-            <xsl:text>>> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+            <xsl:choose>
+              <xsl:when test="$bomb-testsuite = '0'">
+                <xsl:text>>> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>>> $TEST_LOG 2>&1&#xA;</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:when>
         </xsl:choose>
       </xsl:when>
@@ -202,10 +245,7 @@
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
             <xsl:apply-templates/>
-            <xsl:if test="contains(string(),'test_summary')">
-              <xsl:text> >> $TEST_LOG</xsl:text>
-            </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
+            <xsl:text> >> $TEST_LOG&#xA;</xsl:text>
           </xsl:when>
         </xsl:choose>
       </xsl:when>

Modified: jhalfs/branches/1.0/HLFS/hlfs.xsl
===================================================================
--- jhalfs/branches/1.0/HLFS/hlfs.xsl	2006-08-05 14:51:11 UTC (rev 2882)
+++ jhalfs/branches/1.0/HLFS/hlfs.xsl	2006-08-05 15:11:06 UTC (rev 2883)
@@ -26,9 +26,16 @@
        0 = none
        1 = only chapter06 Glibc, GCC and Binutils testsuites
        2 = all chapter06 testsuites
-       3 = alias to 2 -->
+       3 = alias to 2
+  -->
   <xsl:param name="testsuite" select="1"/>
 
+  <!-- Bomb on test suites failures?
+       0 = no, I want to build the full system and review the logs
+       1 = yes, bomb at the first test suite failure to can review the build dir
+  -->
+  <xsl:param name="bomb-testsuite" select="0"/>
+
   <!-- Time zone -->
   <xsl:param name="timezone" select="GMT"/>
 
@@ -135,10 +142,18 @@
     <xsl:if test="(contains(string(),'test') or
                   contains(string(),'check')) and
                   ($testsuite = '2' 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> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+      <xsl:choose>
+        <xsl:when test="$bomb-testsuite = '0'">
+          <xsl:value-of select="substring-before(string(),'make')"/>
+          <xsl:text>make -k</xsl:text>
+          <xsl:value-of select="substring-after(string(),'make')"/>
+          <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+          <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
   </xsl:template>
 
@@ -205,11 +220,24 @@
         <xsl:choose>
           <xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
           <xsl:otherwise>
-            <xsl:apply-templates/>
+            <xsl:if test="not(contains(string(),'check'))">
+              <xsl:apply-templates/>
+              <xsl:text>&#xA;</xsl:text>
+            </xsl:if>
             <xsl:if test="contains(string(),'check')">
-              <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text>
+              <xsl:choose>
+                <xsl:when test="$bomb-testsuite = '0'">
+                  <xsl:value-of select="substring-before(string(),'check')"/>
+                  <xsl:text>-k check</xsl:text>
+                  <xsl:value-of select="substring-after(string(),'check')"/>
+                  <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates/>
+                  <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
@@ -217,7 +245,15 @@
       <xsl:when test="string() = 'make -k check'">
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
-            <xsl:text>make -k check >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+            <xsl:apply-templates/>
+            <xsl:choose>
+              <xsl:when test="$bomb-testsuite = '0'">
+                <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:when>
         </xsl:choose>
       </xsl:when>
@@ -226,7 +262,14 @@
         <xsl:choose>
           <xsl:when test="$testsuite != '0'">
             <xsl:value-of select="substring-before(string(),'> glibc-')"/>
-            <xsl:text>>> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+            <xsl:choose>
+              <xsl:when test="$bomb-testsuite = '0'">
+                <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:when>
         </xsl:choose>
       </xsl:when>

Modified: jhalfs/branches/1.0/LFS/lfs.xsl
===================================================================
--- jhalfs/branches/1.0/LFS/lfs.xsl	2006-08-05 14:51:11 UTC (rev 2882)
+++ jhalfs/branches/1.0/LFS/lfs.xsl	2006-08-05 15:11:06 UTC (rev 2883)
@@ -17,9 +17,16 @@
        0 = none
        1 = only chapter06 Glibc, GCC and Binutils testsuites
        2 = all chapter06 testsuites
-       3 = all chapter05 and chapter06 testsuites-->
+       3 = all chapter05 and chapter06 testsuites
+  -->
   <xsl:param name="testsuite" select="1"/>
 
+  <!-- Bomb on test suites failures?
+       0 = no, I want to build the full system and review the logs
+       1 = yes, bomb at the first test suite failure to can review the build dir
+  -->
+  <xsl:param name="bomb-testsuite" select="0"/>
+
   <!-- Install vim-lang package? -->
   <xsl:param name="vim-lang" select="1"/>
 
@@ -109,10 +116,18 @@
             (($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> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+      <xsl:choose>
+        <xsl:when test="$bomb-testsuite = '0'">
+          <xsl:value-of select="substring-before(string(),'make')"/>
+          <xsl:text>make -k</xsl:text>
+          <xsl:value-of select="substring-after(string(),'make')"/>
+          <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+          <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
   </xsl:template>
 
@@ -160,11 +175,24 @@
         <xsl:choose>
           <xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
           <xsl:otherwise>
-            <xsl:apply-templates/>
+            <xsl:if test="not(contains(string(),'check'))">
+              <xsl:apply-templates/>
+              <xsl:text>&#xA;</xsl:text>
+            </xsl:if>
             <xsl:if test="contains(string(),'check')">
-              <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text>
+              <xsl:choose>
+                <xsl:when test="$bomb-testsuite = '0'">
+                  <xsl:value-of select="substring-before(string(),'check')"/>
+                  <xsl:text>-k check</xsl:text>
+                  <xsl:value-of select="substring-after(string(),'check')"/>
+                  <xsl:text> >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates/>
+                  <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
@@ -175,7 +203,15 @@
           <xsl:when test="(($testsuite = '1' or $testsuite = '2') and
                     ancestor::chapter[@id='chapter-building-system']) or
                     $testsuite = '3'">
-            <xsl:text>make -k check >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+            <xsl:choose>
+              <xsl:when test="$bomb-testsuite = '0'">
+                <xsl:text>make -k check >> $TEST_LOG 2>&1 || true&#xA;</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:apply-templates/>
+                <xsl:text> >> $TEST_LOG 2>&1&#xA;</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:when>
         </xsl:choose>
       </xsl:when>
@@ -194,10 +230,7 @@
                     ancestor::chapter[@id='chapter-building-system']) or
                     $testsuite = '3'">
             <xsl:apply-templates/>
-            <xsl:if test="contains(string(),'test_summary')">
-              <xsl:text> >> $TEST_LOG</xsl:text>
-            </xsl:if>
-            <xsl:text>&#xA;</xsl:text>
+            <xsl:text> >> $TEST_LOG&#xA;</xsl:text>
           </xsl:when>
         </xsl:choose>
       </xsl:when>

Modified: jhalfs/branches/1.0/common/common-functions
===================================================================
--- jhalfs/branches/1.0/common/common-functions	2006-08-05 14:51:11 UTC (rev 2882)
+++ jhalfs/branches/1.0/common/common-functions	2006-08-05 15:11:06 UTC (rev 2883)
@@ -714,6 +714,7 @@
                  --xinclude \
                  --stringparam method $METHOD \
                  --stringparam testsuite $TEST \
+                 --stringparam bomb-testsuite $BOMB_TEST \
                  --stringparam vim-lang $VIMLANG \
                  --stringparam timezone $TIMEZONE \
                  --stringparam page $PAGE \
@@ -727,6 +728,7 @@
                  --xinclude \
                  --stringparam model $MODEL \
                  --stringparam testsuite $TEST \
+                 --stringparam bomb-testsuite $BOMB_TEST \
                  --stringparam timezone $TIMEZONE \
                  --stringparam page $PAGE \
                  --stringparam lang $LANG \
@@ -740,6 +742,7 @@
         xsltproc --nonet \
                  --xinclude \
                  --stringparam testsuite $TEST \
+                 --stringparam bomb-testsuite $BOMB_TEST \
                  --stringparam vim-lang $VIMLANG \
                  --stringparam timezone $TIMEZONE \
                  --stringparam page $PAGE \

Modified: jhalfs/branches/1.0/common/config
===================================================================
--- jhalfs/branches/1.0/common/config	2006-08-05 14:51:11 UTC (rev 2882)
+++ jhalfs/branches/1.0/common/config	2006-08-05 15:11:06 UTC (rev 2883)
@@ -51,6 +51,11 @@
 #      (in CLFS and HLFS, alias to 2)
 TEST=1
 
+#--- Bomb on test suites failures?
+#  0 = no, I want to build the full system and review the logs
+#  1 = yes, bomb at the first test suite failure to can review the build dir
+BOMB_TEST=0
+
 #--- Run the stripping phases  0(no)/1(yes)
 STRIP=1
 

Modified: jhalfs/branches/1.0/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/1.0/common/func_validate_configs.sh	2006-08-05 14:51:11 UTC (rev 2882)
+++ jhalfs/branches/1.0/common/func_validate_configs.sh	2006-08-05 15:11:06 UTC (rev 2883)
@@ -84,9 +84,9 @@
 inline_doc
 
   # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
-  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
-  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
-  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
+  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
+  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
 
   local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
   local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
@@ -202,6 +202,7 @@
       RUN_FARCE)  [[ "$COMPARE" = "1" ]] && validate_against_str "x0x x1x" ;;
       ITERATIONS) [[ "$COMPARE" = "1" ]] && validate_against_str "x2x x3x x4x x5x" ;;
       TEST)       validate_against_str "x0x x1x x2x x3x" ;;
+      BOMB_TEST)  [[ ! "$TEST" = "0" ]] && validate_against_str "x0x x1x" ;;
       OPTIMIZE)   validate_against_str "x0x x1x x2x" ;;
       STRIP)      validate_against_str "x0x x1x" ;;
       VIMLANG)    validate_against_str "x0x x1x" ;;




More information about the alfs-log mailing list