Changeset 1d5f3e3
- Timestamp:
- 01/07/2018 08:20:12 PM (7 years ago)
- Branches:
- ablfs-more, legacy, trunk
- Children:
- 489bdc2
- Parents:
- 4b2a5fd
- Files:
-
- 2 edited
-
Config.in (modified) (3 diffs)
-
LFS/lfs.xsl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
Config.in
r4b2a5fd r1d5f3e3 800 800 help 801 801 #-- Run test suites 802 # 802 # If you select 'y' here: 803 803 # You will have to select between: 804 #805 804 # - Only critical final system testsuites 806 805 # - All final system testsuites 807 806 # - Both temporary tools and final system testsuites 807 # You will be prompted also about the "flavour" of the 808 # testsuites run: 809 # - Don't stop on test suite failures 810 # - Abort the build at the first test suite failure 811 # 812 # Note that in any case, all the test instructions will 813 # be generated. Those which are not wanted will be commented 814 # out. If you select 'n' here, the commented test instructions 815 # do not stop on test suite failures. 808 816 # 809 817 # HLFS and CLFS have no testsuites available in the 810 818 # temporary tools phase 811 # You will be prompted also about the "flavour" of the812 # testsuites run:813 #814 # - Don't stop on test suite failures815 # - Abort the build at the first test suite failure816 #817 819 818 820 menu "Test settings" … … 827 829 #-- Critical tests: 828 830 # Only Glibc, Binutils, GMP, MPFR, MPC and GCC 829 # testsuites for final system 831 # testsuites for final system. The others are commented 832 # out. 830 833 831 834 config TST_2 832 835 bool "All final system testsuites" 836 help 837 #-- All final system test suites: 838 # Test instructions for the temporary tools (if available) 839 # are commented out. 833 840 834 841 config TST_3 … … 836 843 help 837 844 #-- All tests: 838 # Runs all the testsuites for both temporary tools 839 # a nd final system845 # Runs all the testsuites for both temporary tools (if 846 # available) and final system 840 847 endchoice 841 848 -
LFS/lfs.xsl
r4b2a5fd r1d5f3e3 412 412 </xsl:when> 413 413 <!-- test instructions --> 414 <xsl:when test="@remap = 'test'"> 415 <xsl:choose> 416 <xsl:when test="$testsuite = '0'"/> 417 <xsl:when test="$testsuite = '1' and 414 <xsl:when test="@remap = 'test'"> 415 <xsl:if test="$testsuite = '0' or 416 $testsuite = '1' and 418 417 not(ancestor::sect1[@id='ch-system-gcc']) and 419 418 not(ancestor::sect1[@id='ch-system-glibc']) and 420 419 not(ancestor::sect1[@id='ch-system-gmp']) and 421 420 not(ancestor::sect1[@id='ch-system-mpfr']) and 422 not(ancestor::sect1[@id='ch-system-binutils'])"/> 423 <xsl:when test="$testsuite = '2' and 424 ancestor::chapter[@id='chapter-temporary-tools']"/> 425 <xsl:otherwise> 421 not(ancestor::sect1[@id='ch-system-binutils']) or 422 $testsuite = '2' and 423 ancestor::chapter[@id='chapter-temporary-tools']"> 424 <xsl:text># </xsl:text> 425 </xsl:if> 426 <xsl:choose> 427 <xsl:when test="$bomb-testsuite = 'n'"> 426 428 <xsl:choose> 427 <xsl:when test="$bomb-testsuite = 'n'"> 428 <xsl:choose> 429 <!-- special case for glibc --> 430 <xsl:when test="contains(string(), 'glibc-check-log')"> 431 <xsl:value-of 432 select="substring-before(string(),'2>&1')"/> 433 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 434 </xsl:when> 435 <!-- special case for procps-ng --> 436 <xsl:when test="contains(string(), 'pushd')"> 437 <xsl:text>{ </xsl:text> 438 <xsl:apply-templates/> 439 <xsl:text>; } >> $TEST_LOG 2>&1 || true
</xsl:text> 440 </xsl:when> 441 <xsl:when test="contains(string(), 'make -k')"> 442 <xsl:apply-templates/> 443 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 444 </xsl:when> 445 <xsl:when test="contains(string(), 'make')"> 446 <xsl:value-of select="substring-before(string(),'make')"/> 447 <xsl:text>make -k</xsl:text> 448 <xsl:value-of select="substring-after(string(),'make')"/> 449 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 450 </xsl:when> 451 <xsl:otherwise> 452 <xsl:apply-templates/> 453 <xsl:if test="not(contains(string(), '>>'))"> 454 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 455 </xsl:if> 456 <xsl:text>
</xsl:text> 457 </xsl:otherwise> 458 </xsl:choose> 429 <!-- special case for glibc --> 430 <xsl:when test="contains(string(), 'glibc-check-log')"> 431 <xsl:value-of 432 select="substring-before(string(),'2>&1')"/> 433 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 434 </xsl:when> 435 <!-- special case for procps-ng --> 436 <xsl:when test="contains(string(), 'pushd')"> 437 <xsl:text>{ </xsl:text> 438 <xsl:apply-templates/> 439 <xsl:text>; } >> $TEST_LOG 2>&1 || true
</xsl:text> 440 </xsl:when> 441 <xsl:when test="contains(string(), 'make -k')"> 442 <xsl:apply-templates/> 443 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 444 </xsl:when> 445 <xsl:when test="contains(string(), 'make')"> 446 <xsl:value-of select="substring-before(string(),'make')"/> 447 <xsl:text>make -k</xsl:text> 448 <xsl:value-of select="substring-after(string(),'make')"/> 449 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 459 450 </xsl:when> 460 451 <xsl:otherwise> 461 <!-- bomb-testsuite != 'n'--> 462 <xsl:choose> 463 <!-- special case for glibc --> 464 <xsl:when test="contains(string(), 'glibc-check-log')"> 465 <xsl:value-of 466 select="substring-before(string(),'2>&1')"/> 467 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 468 </xsl:when> 469 <!-- special case for gmp --> 470 <xsl:when test="contains(string(), 'tee gmp-check-log')"> 471 <xsl:text>(</xsl:text> 472 <xsl:apply-templates/> 473 <xsl:text>>> $TEST_LOG 2>&1 && exit $PIPESTATUS)
</xsl:text> 474 </xsl:when> 475 <!-- special case for procps-ng --> 476 <xsl:when test="contains(string(), 'pushd')"> 477 <xsl:text>{ </xsl:text> 478 <xsl:apply-templates/> 479 <xsl:text>; } >> $TEST_LOG 2>&1
</xsl:text> 480 </xsl:when> 481 <xsl:when test="contains(string(), 'make -k')"> 482 <xsl:apply-templates/> 483 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 484 </xsl:when> 485 <xsl:otherwise> 486 <xsl:apply-templates/> 487 <xsl:if test="not(contains(string(), '>>'))"> 488 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 489 </xsl:if> 490 <xsl:text>
</xsl:text> 491 </xsl:otherwise> 492 </xsl:choose> 452 <xsl:apply-templates/> 453 <xsl:if test="not(contains(string(), '>>'))"> 454 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 455 </xsl:if> 456 <xsl:text>
</xsl:text> 493 457 </xsl:otherwise> 494 458 </xsl:choose> 495 </xsl:otherwise> 459 </xsl:when> 460 <xsl:otherwise> 461 <!-- bomb-testsuite != 'n'--> 462 <xsl:choose> 463 <!-- special case for glibc --> 464 <xsl:when test="contains(string(), 'glibc-check-log')"> 465 <xsl:value-of 466 select="substring-before(string(),'2>&1')"/> 467 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 468 </xsl:when> 469 <!-- special case for gmp --> 470 <xsl:when test="contains(string(), 'tee gmp-check-log')"> 471 <xsl:text>(</xsl:text> 472 <xsl:apply-templates/> 473 <xsl:text>>> $TEST_LOG 2>&1 && exit $PIPESTATUS)
</xsl:text> 474 </xsl:when> 475 <!-- special case for procps-ng --> 476 <xsl:when test="contains(string(), 'pushd')"> 477 <xsl:text>{ </xsl:text> 478 <xsl:apply-templates/> 479 <xsl:text>; } >> $TEST_LOG 2>&1
</xsl:text> 480 </xsl:when> 481 <xsl:when test="contains(string(), 'make -k')"> 482 <xsl:apply-templates/> 483 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 484 </xsl:when> 485 <xsl:otherwise> 486 <xsl:apply-templates/> 487 <xsl:if test="not(contains(string(), '>>'))"> 488 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 489 </xsl:if> 490 <xsl:text>
</xsl:text> 491 </xsl:otherwise> 492 </xsl:choose> 493 </xsl:otherwise> <!-- end not bomb-test=n --> 496 494 </xsl:choose> 497 495 </xsl:when>
Note:
See TracChangeset
for help on using the changeset viewer.
