Always generate test instructions, and comment unwanted ones out.
Fixes ticket #1695, also for CLFS...
This commit is contained in:
parent
1d5f3e309f
commit
489bdc21d1
1 changed files with 107 additions and 107 deletions
|
@ -137,7 +137,9 @@
|
|||
<xsl:template match="para/userinput">
|
||||
<xsl:if test="(contains(string(),'test') or
|
||||
contains(string(),'check')) and
|
||||
($testsuite = '2' or $testsuite = '3')">
|
||||
not($testsuite = '2' or $testsuite = '3')">
|
||||
<xsl:text># </xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when test="$bomb-testsuite = 'n'">
|
||||
<xsl:value-of select="substring-before(string(),'make')"/>
|
||||
|
@ -154,7 +156,6 @@
|
|||
<xsl:text>
</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="userinput" mode="screen">
|
||||
|
@ -191,12 +192,11 @@
|
|||
<xsl:when test="contains(string(),'menuconfig')"/>
|
||||
<!-- test instructions -->
|
||||
<xsl:when test="@remap = 'test'">
|
||||
<xsl:choose>
|
||||
<xsl:if test="not(ancestor::note[@os='a00'] and $method='chroot')">
|
||||
<!-- 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 = '1' and
|
||||
<xsl:if test="
|
||||
$testsuite = '0' or
|
||||
$testsuite = '1' and
|
||||
not(ancestor::sect1[@id='ch-system-gcc']) and
|
||||
not(ancestor::sect1[contains(@id,'ch-system-eglibc')]) and
|
||||
not(ancestor::sect1[contains(@id,'ch-system-glibc')]) and
|
||||
|
@ -207,8 +207,9 @@
|
|||
not(ancestor::sect1[contains(@id,'ch-system-isl')]) and
|
||||
not(ancestor::sect1[contains(@id,'ch-system-cloog')]) and
|
||||
not(ancestor::sect1[contains(@id,'ch-system-cloog-ppl')]) and
|
||||
not(ancestor::sect1[@id='ch-system-binutils'])"/>
|
||||
<xsl:otherwise>
|
||||
not(ancestor::sect1[@id='ch-system-binutils'])">
|
||||
<xsl:text># </xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when test="$bomb-testsuite = 'n'">
|
||||
<xsl:choose>
|
||||
|
@ -278,8 +279,7 @@
|
|||
</xsl:choose>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:if><!-- avoid executing note before perl tests -->
|
||||
</xsl:when>
|
||||
<!-- End of test instructions -->
|
||||
|
||||
|
|
Reference in a new issue