zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HLFS: revised testsuites run.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-12-08 11:56:07 +00:00
parent 7e5ea15f45
commit ff43bb8088
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
HLFS/hlfs.xsl
View file

@ -234,15 +234,19 @@
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<!-- Fixing butterfly toolchain test suites run --> <!-- Fixing butterfly toolchain test suites run -->
<xsl:when test="string() = 'make -k check' or string() = 'make check'"> <xsl:when test="string() = 'make -k check'
or string() = 'make check'
or string() = 'make tests'">
<xsl:choose> <xsl:choose>
<xsl:when test="$testsuite != '0'"> <xsl:when test="(ancestor::sect1[@id='ch-system-butterfly-toolchain']
<xsl:apply-templates/> and $testsuite != '0') or
$testsuite = '2' or $testsuite = '3'">
<xsl:choose> <xsl:choose>
<xsl:when test="$bomb-testsuite = 'n'"> <xsl:when test="$bomb-testsuite = 'n'">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text> <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:apply-templates/>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text>
<xsl:if test="contains(string(),' -k ')"> <xsl:if test="contains(string(),' -k ')">
<xsl:text> || true</xsl:text> <xsl:text> || true</xsl:text>
@ -257,23 +261,12 @@
<xsl:when test="contains(string(),'glibc-check-log')"> <xsl:when test="contains(string(),'glibc-check-log')">
<xsl:choose> <xsl:choose>
<xsl:when test="$testsuite != '0'"> <xsl:when test="$testsuite != '0'">
<xsl:value-of select="substring-before(string(),'&gt; glibc-')"/> <xsl:value-of select="substring-before(string(),'2&gt;&amp;1')"/>
<xsl:choose> <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
<xsl:when test="$bomb-testsuite = 'n'">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;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:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<!-- Don't stop on strip run and chapter05 GCC installation test--> <!-- Don't stop on strip run -->
<xsl:when test="contains(string(),'strip ') or <xsl:when test="contains(string(),'strip ') or
ancestor::sect2[@id='testing-gcc'] and ancestor::sect2[@id='testing-gcc'] and
not(contains(string(),'EOF'))"> not(contains(string(),'EOF'))">