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

Tidy up clfs.xsl:

Browse source 
- add 32 bit critical tests when in multilib
- allow the "note" in perl to be run only when method=boot, and tests
are asked
- remove some useless lines
This commit is contained in:
Pierre Labastie 2014-03-09 08:59:46 +00:00
parent 2c4be7f2b5
commit ee2c45c751
1 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
CLFS/clfs.xsl
View file

@ -187,26 +187,28 @@
<!-- test instructions --> <!-- test instructions -->
<xsl:when test="@remap = 'test'"> <xsl:when test="@remap = 'test'">
<xsl:choose> <xsl:choose>
<!-- Avoid executing the note before perl tests while in 'chroot' -->
<xsl:when test="ancestor::note[@os='a00'] and $method='chroot'"/>
<xsl:when test="$testsuite = '0'"/> <xsl:when test="$testsuite = '0'"/>
<xsl:when test="$testsuite = '1' and <xsl:when test=
not(ancestor::sect1[@id='ch-system-gcc']) and "$testsuite = '1' and
not(ancestor::sect1[@id='ch-system-eglibc']) and not(ancestor::sect1[@id='ch-system-gcc']) and
not(ancestor::sect1[@id='ch-system-gmp']) and not(ancestor::sect1[contains(@id,'ch-system-eglibc')]) and
not(ancestor::sect1[@id='ch-system-mpfr']) and not(ancestor::sect1[contains(@id,'ch-system-glibc')]) and
not(ancestor::sect1[@id='ch-system-mpc']) and not(ancestor::sect1[contains(@id,'ch-system-gmp')]) and
not(ancestor::sect1[@id='ch-system-ppl']) and not(ancestor::sect1[contains(@id,'ch-system-mpfr')]) and
not(ancestor::sect1[@id='ch-system-isl']) and not(ancestor::sect1[contains(@id,'ch-system-mpc')]) and
not(ancestor::sect1[@id='ch-system-cloog']) and not(ancestor::sect1[contains(@id,'ch-system-ppl')]) and
not(ancestor::sect1[@id='ch-system-cloog-ppl']) and not(ancestor::sect1[contains(@id,'ch-system-isl')]) and
not(ancestor::sect1[@id='ch-system-binutils'])"/> not(ancestor::sect1[contains(@id,'ch-system-cloog')]) and
<xsl:when test="$testsuite = '2' and not(ancestor::sect1[contains(@id,'ch-system-cloog-ppl')]) and
ancestor::chapter[@id='ch-temp-system']"/> not(ancestor::sect1[@id='ch-system-binutils'])"/>
<xsl:otherwise> <xsl:otherwise>
<xsl:choose> <xsl:choose>
<xsl:when test="$bomb-testsuite = 'n'"> <xsl:when test="$bomb-testsuite = 'n'">
<xsl:choose> <xsl:choose>
<!-- special case for eglibc --> <!-- special case for (e)glibc -->
<xsl:when test="contains(string(), 'eglibc-check-log')"> <xsl:when test="contains(string(), 'glibc-check-log')">
<xsl:value-of <xsl:value-of
select="substring-before(string(),'2&gt;&amp;1')"/> select="substring-before(string(),'2&gt;&amp;1')"/>
<xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text> <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
@ -239,8 +241,8 @@
<xsl:otherwise> <xsl:otherwise>
<!-- bomb-testsuite != 'n'--> <!-- bomb-testsuite != 'n'-->
<xsl:choose> <xsl:choose>
<!-- special case for eglibc --> <!-- special case for (e)glibc -->
<xsl:when test="contains(string(), 'eglibc-check-log')"> <xsl:when test="contains(string(), 'glibc-check-log')">
<xsl:value-of <xsl:value-of
select="substring-before(string(),'2&gt;&amp;1')"/> select="substring-before(string(),'2&gt;&amp;1')"/>
<xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text> <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
@ -277,7 +279,7 @@
<!-- End of test instructions --> <!-- End of test instructions -->
<!-- Fixing toolchain test suites run XXX more to fix --> <!-- Fixing toolchain test suites run XXX more to fix -->
<xsl:when test="contains(string(),'eglibc-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(),'2&gt;')"/> <xsl:value-of select="substring-before(string(),'2&gt;')"/>
@ -338,13 +340,6 @@
<xsl:value-of select="substring-after(string(),'make ')"/> <xsl:value-of select="substring-after(string(),'make ')"/>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
<!-- Avoid calling hostname in chroot -->
<xsl:when test="ancestor::note[@os='a00']">
<xsl:if test="$method='boot'">
<xsl:apply-templates/>
<xsl:text>&#xA;</xsl:text>
</xsl:if>
</xsl:when>
<!-- The rest of commands --> <!-- The rest of commands -->
<xsl:otherwise> <xsl:otherwise>
<xsl:apply-templates/> <xsl:apply-templates/>