- Timestamp:
- 01/07/2018 09:22:46 PM (6 years ago)
- Branches:
- ablfs-more, legacy, trunk
- Children:
- 5a8939e
- Parents:
- 1d5f3e3
- File:
-
- 1 edited
-
CLFS/clfs.xsl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CLFS/clfs.xsl
r1d5f3e3 r489bdc2 138 138 <xsl:if test="(contains(string(),'test') or 139 139 contains(string(),'check')) and 140 ($testsuite = '2' or $testsuite = '3')"> 141 <xsl:choose> 142 <xsl:when test="$bomb-testsuite = 'n'"> 143 <xsl:value-of select="substring-before(string(),'make')"/> 144 <xsl:text>make -k</xsl:text> 145 <xsl:value-of select="substring-after(string(),'make')"/> 146 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 147 </xsl:when> 148 <xsl:otherwise> 149 <xsl:apply-templates/> 150 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 151 <xsl:if test="contains(string(),' -k ')"> 152 <xsl:text> || true</xsl:text> 153 </xsl:if> 154 <xsl:text>
</xsl:text> 155 </xsl:otherwise> 156 </xsl:choose> 140 not($testsuite = '2' or $testsuite = '3')"> 141 <xsl:text># </xsl:text> 157 142 </xsl:if> 143 <xsl:choose> 144 <xsl:when test="$bomb-testsuite = 'n'"> 145 <xsl:value-of select="substring-before(string(),'make')"/> 146 <xsl:text>make -k</xsl:text> 147 <xsl:value-of select="substring-after(string(),'make')"/> 148 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 149 </xsl:when> 150 <xsl:otherwise> 151 <xsl:apply-templates/> 152 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 153 <xsl:if test="contains(string(),' -k ')"> 154 <xsl:text> || true</xsl:text> 155 </xsl:if> 156 <xsl:text>
</xsl:text> 157 </xsl:otherwise> 158 </xsl:choose> 158 159 </xsl:template> 159 160 … … 191 192 <xsl:when test="contains(string(),'menuconfig')"/> 192 193 <!-- test instructions --> 193 <xsl:when test="@remap = 'test'"> 194 <xsl:choose> 195 <!-- Avoid executing the note before perl tests while in 'chroot' --> 196 <xsl:when test="ancestor::note[@os='a00'] and $method='chroot'"/> 197 <xsl:when test="$testsuite = '0'"/> 198 <xsl:when test= 199 "$testsuite = '1' and 200 not(ancestor::sect1[@id='ch-system-gcc']) and 201 not(ancestor::sect1[contains(@id,'ch-system-eglibc')]) and 202 not(ancestor::sect1[contains(@id,'ch-system-glibc')]) and 203 not(ancestor::sect1[contains(@id,'ch-system-gmp')]) and 204 not(ancestor::sect1[contains(@id,'ch-system-mpfr')]) and 205 not(ancestor::sect1[contains(@id,'ch-system-mpc')]) and 206 not(ancestor::sect1[contains(@id,'ch-system-ppl')]) and 207 not(ancestor::sect1[contains(@id,'ch-system-isl')]) and 208 not(ancestor::sect1[contains(@id,'ch-system-cloog')]) and 209 not(ancestor::sect1[contains(@id,'ch-system-cloog-ppl')]) and 210 not(ancestor::sect1[@id='ch-system-binutils'])"/> 211 <xsl:otherwise> 212 <xsl:choose> 213 <xsl:when test="$bomb-testsuite = 'n'"> 214 <xsl:choose> 215 <!-- special case for (e)glibc --> 216 <xsl:when test="contains(string(), 'glibc-check-log')"> 217 <xsl:value-of 218 select="substring-before(string(),'2>&1')"/> 219 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 220 </xsl:when> 221 <!-- special case for procps-ng --> 222 <xsl:when test="contains(string(), 'pushd')"> 223 <xsl:text>{ </xsl:text> 224 <xsl:apply-templates/> 225 <xsl:text>; } >> $TEST_LOG 2>&1 || true
</xsl:text> 226 </xsl:when> 227 <xsl:when test="contains(string(), 'make -k')"> 228 <xsl:apply-templates/> 229 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 230 </xsl:when> 231 <xsl:when test="contains(string(), 'make')"> 232 <xsl:value-of select="substring-before(string(),'make')"/> 233 <xsl:text>make -k</xsl:text> 234 <xsl:value-of select="substring-after(string(),'make')"/> 235 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 236 </xsl:when> 237 <xsl:otherwise> 238 <xsl:apply-templates/> 239 <xsl:if test="not(contains(string(), '>>'))"> 240 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 241 </xsl:if> 242 <xsl:text>
</xsl:text> 243 </xsl:otherwise> 244 </xsl:choose> 245 </xsl:when> 246 <xsl:otherwise> 247 <!-- bomb-testsuite != 'n'--> 248 <xsl:choose> 249 <!-- special case for (e)glibc --> 250 <xsl:when test="contains(string(), 'glibc-check-log')"> 251 <xsl:value-of 252 select="substring-before(string(),'2>&1')"/> 253 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 254 </xsl:when> 255 <!-- special case for gmp --> 256 <xsl:when test="contains(string(), 'tee gmp-check-log')"> 257 <xsl:text>(</xsl:text> 258 <xsl:apply-templates/> 259 <xsl:text>>> $TEST_LOG 2>&1 && exit $PIPESTATUS)
</xsl:text> 260 </xsl:when> 261 <!-- special case for procps-ng --> 262 <xsl:when test="contains(string(), 'pushd')"> 263 <xsl:text>{ </xsl:text> 264 <xsl:apply-templates/> 265 <xsl:text>; } >> $TEST_LOG 2>&1
</xsl:text> 266 </xsl:when> 267 <xsl:when test="contains(string(), 'make -k')"> 268 <xsl:apply-templates/> 269 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 270 </xsl:when> 271 <xsl:otherwise> 272 <xsl:apply-templates/> 273 <xsl:if test="not(contains(string(), '>>'))"> 274 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 275 </xsl:if> 276 <xsl:text>
</xsl:text> 277 </xsl:otherwise> 278 </xsl:choose> 279 </xsl:otherwise> 280 </xsl:choose> 281 </xsl:otherwise> 282 </xsl:choose> 194 <xsl:when test="@remap = 'test'"> 195 <xsl:if test="not(ancestor::note[@os='a00'] and $method='chroot')"> 196 <!-- Avoid executing the note before perl tests while in 'chroot' --> 197 <xsl:if test=" 198 $testsuite = '0' or 199 $testsuite = '1' and 200 not(ancestor::sect1[@id='ch-system-gcc']) and 201 not(ancestor::sect1[contains(@id,'ch-system-eglibc')]) and 202 not(ancestor::sect1[contains(@id,'ch-system-glibc')]) and 203 not(ancestor::sect1[contains(@id,'ch-system-gmp')]) and 204 not(ancestor::sect1[contains(@id,'ch-system-mpfr')]) and 205 not(ancestor::sect1[contains(@id,'ch-system-mpc')]) and 206 not(ancestor::sect1[contains(@id,'ch-system-ppl')]) and 207 not(ancestor::sect1[contains(@id,'ch-system-isl')]) and 208 not(ancestor::sect1[contains(@id,'ch-system-cloog')]) and 209 not(ancestor::sect1[contains(@id,'ch-system-cloog-ppl')]) and 210 not(ancestor::sect1[@id='ch-system-binutils'])"> 211 <xsl:text># </xsl:text> 212 </xsl:if> 213 <xsl:choose> 214 <xsl:when test="$bomb-testsuite = 'n'"> 215 <xsl:choose> 216 <!-- special case for (e)glibc --> 217 <xsl:when test="contains(string(), 'glibc-check-log')"> 218 <xsl:value-of 219 select="substring-before(string(),'2>&1')"/> 220 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 221 </xsl:when> 222 <!-- special case for procps-ng --> 223 <xsl:when test="contains(string(), 'pushd')"> 224 <xsl:text>{ </xsl:text> 225 <xsl:apply-templates/> 226 <xsl:text>; } >> $TEST_LOG 2>&1 || true
</xsl:text> 227 </xsl:when> 228 <xsl:when test="contains(string(), 'make -k')"> 229 <xsl:apply-templates/> 230 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 231 </xsl:when> 232 <xsl:when test="contains(string(), 'make')"> 233 <xsl:value-of select="substring-before(string(),'make')"/> 234 <xsl:text>make -k</xsl:text> 235 <xsl:value-of select="substring-after(string(),'make')"/> 236 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 237 </xsl:when> 238 <xsl:otherwise> 239 <xsl:apply-templates/> 240 <xsl:if test="not(contains(string(), '>>'))"> 241 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 242 </xsl:if> 243 <xsl:text>
</xsl:text> 244 </xsl:otherwise> 245 </xsl:choose> 246 </xsl:when> 247 <xsl:otherwise> 248 <!-- bomb-testsuite != 'n'--> 249 <xsl:choose> 250 <!-- special case for (e)glibc --> 251 <xsl:when test="contains(string(), 'glibc-check-log')"> 252 <xsl:value-of 253 select="substring-before(string(),'2>&1')"/> 254 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 255 </xsl:when> 256 <!-- special case for gmp --> 257 <xsl:when test="contains(string(), 'tee gmp-check-log')"> 258 <xsl:text>(</xsl:text> 259 <xsl:apply-templates/> 260 <xsl:text>>> $TEST_LOG 2>&1 && exit $PIPESTATUS)
</xsl:text> 261 </xsl:when> 262 <!-- special case for procps-ng --> 263 <xsl:when test="contains(string(), 'pushd')"> 264 <xsl:text>{ </xsl:text> 265 <xsl:apply-templates/> 266 <xsl:text>; } >> $TEST_LOG 2>&1
</xsl:text> 267 </xsl:when> 268 <xsl:when test="contains(string(), 'make -k')"> 269 <xsl:apply-templates/> 270 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 271 </xsl:when> 272 <xsl:otherwise> 273 <xsl:apply-templates/> 274 <xsl:if test="not(contains(string(), '>>'))"> 275 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 276 </xsl:if> 277 <xsl:text>
</xsl:text> 278 </xsl:otherwise> 279 </xsl:choose> 280 </xsl:otherwise> 281 </xsl:choose> 282 </xsl:if><!-- avoid executing note before perl tests --> 283 283 </xsl:when> 284 284 <!-- End of test instructions -->
Note:
See TracChangeset
for help on using the changeset viewer.
