Changeset 7c4730c


Ignore:
Timestamp:
07/28/2006 06:04:06 PM (18 years ago)
Author:
George Boudreau <georgeb@…>
Branches:
experimental
Children:
e840d27
Parents:
d0249fc
Message:

Added trap for chap6 glibc testsuite to hlfs.xsl

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Config.in

    rd0249fc r7c4730c  
    391391                        bool    "All chap06 testsuites"
    392392                config  TST_3
    393                         bool    "All chap05/06 testsuites"
     393                        bool    "All chap05/06 testsuites"      if !BOOK_HLFS
    394394           endchoice
    395395           config       TEST

  • HLFS/hlfs.xsl

    rd0249fc r7c4730c  
    101101          </xsl:if>
    102102         
    103           <!-- NEW toolchain format -->
     103          <!-- NEW toolchain format, from inside ./sources dir unpack binutils and gcc -->
    104104          <xsl:if test="@id='ch-tools-embryo-toolchain'">
    105105             <xsl:text>tar -xvf gcc-core-&gcc-version;.*; &#xA;</xsl:text>
    … …  
    119119          <!-- ONLY butterfly has a testsuite -->
    120120          <xsl:if test="@id='ch-tools-butterfly-toolchain' and $testsuite = '3'">
    121             <xsl:text>pushd ../; tar -xvf gcc-testsuite-&gcc-version;.*; popd; &#xA;</xsl:text>
     121            <xsl:text>tar -xvf gcc-testsuite-&gcc-version;.*; &#xA;</xsl:text>
    122122          </xsl:if>
    123123          <!-- END new toolchain format -->
    … …  
    242242        </xsl:choose>
    243243      </xsl:when>
     244
    244245      <!-- Fixing toolchain test suites run -->
    245246      <xsl:when test="string() = 'make check' or
    … …  
    253254        </xsl:choose>
    254255      </xsl:when>
    255       <xsl:when test="contains(string(),'make check') and
    256                 ancestor::sect1[@id='ch-system-binutils']">
    257         <xsl:choose>
    258           <xsl:when test="$testsuite != '0'">
    259             <xsl:value-of select="substring-before(string(),'make check')"/>
    260             <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
    261           </xsl:when>
    262         </xsl:choose>
    263       </xsl:when>
    264       <xsl:when test="contains(string(),'hardened-specs') and
    265                 ancestor::sect1[@id='ch-system-binutils']
     256
     257      <!-- Disable any glibc checks  -->
     258      <xsl:when test="contains(string(),'gcc -fno-stack-protector') and
     259                ancestor::sect1[@id='ch-system-glibc']
    266260                and $testsuite = '0'"/>
     261
    267262      <!-- Don't stop on strip run and chapter05 GCC installation test-->
    268263      <xsl:when test="contains(string(),'strip ') or
    … …  
    272267        <xsl:text> || true&#xA;</xsl:text>
    273268      </xsl:when>
     269
    274270      <!-- The rest of commands -->
    275271      <xsl:otherwise>
Note: See TracChangeset for help on using the changeset viewer.