Changeset 4afcedb for LFS/lfs.xsl
- Timestamp:
- 09/18/2007 09:14:16 PM (17 years ago)
- Branches:
- 2.3, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 81a7fb8
- Parents:
- 38ae01f
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LFS/lfs.xsl
r38ae01f r4afcedb 101 101 </xsl:if> 102 102 </xsl:if> 103 <xsl:apply-templates select=".// para/userinput | .//screen"/>103 <xsl:apply-templates select=".//screen"/> 104 104 <xsl:if test="$testsuite='3' and @id='ch-tools-glibc'"> 105 <xsl:copy-of select="// sect1[@id='ch-system-glibc']/sect2[2]/screen[@role='nodump']"/>105 <xsl:copy-of select="//userinput[@remap='locale-test']"/> 106 106 <xsl:text>
</xsl:text> 107 107 </xsl:if> … … 121 121 </xsl:template> 122 122 123 <xsl:template match="para/userinput">124 <xsl:if test="(contains(string(),'test') or125 contains(string(),'check')) and126 (($testsuite = '2' and127 ancestor::chapter[@id='chapter-building-system']) or128 $testsuite = '3')">129 <xsl:choose>130 <xsl:when test="$bomb-testsuite = 'n'">131 <xsl:value-of select="substring-before(string(),'make')"/>132 <xsl:text>make -k</xsl:text>133 <xsl:value-of select="substring-after(string(),'make')"/>134 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text>135 </xsl:when>136 <xsl:otherwise>137 <xsl:apply-templates/>138 <xsl:text> >> $TEST_LOG 2>&1</xsl:text>139 <xsl:if test="contains(string(),' -k ')">140 <xsl:text> || true</xsl:text>141 </xsl:if>142 <xsl:text>
</xsl:text>143 </xsl:otherwise>144 </xsl:choose>145 </xsl:if>146 </xsl:template>147 148 123 <xsl:template match="userinput" mode="screen"> 149 124 <xsl:choose> … … 185 160 <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or 186 161 ancestor::sect1[@id='ch-system-bash'] or 187 ancestor::sect1[@id='ch-system-module-init-tools']) and 188 (contains(string(),'check') or contains(string(),'nobody') 189 or contains(string(),'dummy'))"> 162 ancestor::sect1[@id='ch-system-module-init-tools']) 163 and @remap = 'test'"> 190 164 <xsl:choose> 191 165 <xsl:when test="$testsuite = '0' or $testsuite = '1'"/> … … 238 212 </xsl:when> 239 213 <!-- Fixing toolchain test suites run --> 240 <xsl:when test="string() = 'make check' or 241 string() = 'make -k check'"> 214 <xsl:when test="(string() = 'make check' or 215 string() = 'make -k check') and 216 (ancestor::sect1[@id='ch-system-gcc'] or 217 ancestor::sect1[@id='ch-system-glibc'] or 218 ancestor::sect1[@id='ch-system-binutils'] or 219 ancestor::sect1[@id='ch-tools-gcc-pass2'])"> 242 220 <xsl:choose> 243 221 <xsl:when test="(($testsuite = '1' or $testsuite = '2') and … … 279 257 </xsl:choose> 280 258 </xsl:when> 259 <!-- The rest of testsuites --> 260 <xsl:when test="@remap = 'test'"> 261 <xsl:choose> 262 <xsl:when test="$testsuite = '0'"/> 263 <xsl:when test="$testsuite = '1' and 264 not(ancestor::sect1[@id='ch-system-gcc']) and 265 not(ancestor::sect1[@id='ch-system-glibc']) and 266 not(ancestor::sect1[@id='ch-system-binutils'])"/> 267 <xsl:when test="$testsuite = '2' and 268 ancestor::chapter[@id='chapter-temporary-tools']"/> 269 <xsl:otherwise> 270 <xsl:choose> 271 <xsl:when test="$bomb-testsuite = 'n'"> 272 <xsl:value-of select="substring-before(string(),'make')"/> 273 <xsl:text>make -k</xsl:text> 274 <xsl:value-of select="substring-after(string(),'make')"/> 275 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 276 </xsl:when> 277 <xsl:otherwise> 278 <xsl:apply-templates/> 279 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 280 <xsl:if test="contains(string(),' -k ')"> 281 <xsl:text> || true</xsl:text> 282 </xsl:if> 283 <xsl:text>
</xsl:text> 284 </xsl:otherwise> 285 </xsl:choose> 286 </xsl:otherwise> 287 </xsl:choose> 288 </xsl:when> 281 289 <!-- Don't stop on strip run --> 282 290 <xsl:when test="contains(string(),'strip ')">
Note:
See TracChangeset
for help on using the changeset viewer.