- Timestamp:
- 01/12/2018 09:40:59 AM (6 years ago)
- Branches:
- ablfs-more, legacy, trunk
- Children:
- c672fa8
- Parents:
- 489bdc2
- Location:
- LFS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LFS/lfs.xsl
r489bdc2 r5a8939e 413 413 <!-- test instructions --> 414 414 <xsl:when test="@remap = 'test'"> 415 <xsl:if test="$testsuite = '0' or 416 $testsuite = '1' and 417 not(ancestor::sect1[@id='ch-system-gcc']) and 418 not(ancestor::sect1[@id='ch-system-glibc']) and 419 not(ancestor::sect1[@id='ch-system-gmp']) and 420 not(ancestor::sect1[@id='ch-system-mpfr']) and 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'"> 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> 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 --> 494 </xsl:choose> 415 <xsl:call-template name="comment-test"> 416 <xsl:with-param name="instructions" select="string()"/> 417 </xsl:call-template> 495 418 </xsl:when> 496 419 <!-- End of test instructions --> … … 959 882 </xsl:template> 960 883 884 <xsl:template name="comment-test"> 885 <xsl:param name="instructions" select="''"/> 886 <xsl:choose> 887 <xsl:when test="contains($instructions,'
')"> 888 <xsl:call-template name="comment-test"> 889 <xsl:with-param name="instructions" 890 select="substring-before($instructions,'
')"/> 891 </xsl:call-template> 892 <xsl:call-template name="comment-test"> 893 <xsl:with-param name="instructions" 894 select="substring-after($instructions,'
')"/> 895 </xsl:call-template> 896 </xsl:when> 897 <xsl:otherwise> 898 <xsl:if test="$testsuite = '0' or 899 $testsuite = '1' and 900 not(ancestor::sect1[@id='ch-system-gcc']) and 901 not(ancestor::sect1[@id='ch-system-glibc']) and 902 not(ancestor::sect1[@id='ch-system-gmp']) and 903 not(ancestor::sect1[@id='ch-system-mpfr']) and 904 not(ancestor::sect1[@id='ch-system-binutils']) or 905 $testsuite = '2' and 906 ancestor::chapter[@id='chapter-temporary-tools']"> 907 <xsl:text># </xsl:text> 908 </xsl:if> 909 <xsl:choose> 910 <xsl:when test="$bomb-testsuite = 'n'"> 911 <xsl:choose> 912 <xsl:when test="contains(string(), 'make -k')"> 913 <xsl:value-of select="$instructions"/> 914 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 915 </xsl:when> 916 <xsl:when test="contains($instructions, 'make')"> 917 <xsl:value-of select="substring-before($instructions, 'make')"/> 918 <xsl:text>make -k</xsl:text> 919 <xsl:value-of select="substring-after($instructions, 'make')"/> 920 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 921 </xsl:when> 922 <xsl:otherwise> 923 <xsl:value-of select="$instructions"/> 924 <xsl:if test="not(contains($instructions, '>>'))"> 925 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 926 </xsl:if> 927 <xsl:text>
</xsl:text> 928 </xsl:otherwise> 929 </xsl:choose> 930 </xsl:when> 931 <xsl:otherwise> 932 <!-- bomb-testsuite != 'n'--> 933 <xsl:choose> 934 <xsl:when test="contains($instructions, 'make -k')"> 935 <xsl:value-of select="$instructions"/> 936 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 937 </xsl:when> 938 <xsl:otherwise> 939 <xsl:value-of select="$instructions"/> 940 <xsl:if test="not(contains($instructions, '>>'))"> 941 <xsl:text> >> $TEST_LOG 2>&1</xsl:text> 942 </xsl:if> 943 <xsl:text>
</xsl:text> 944 </xsl:otherwise> 945 </xsl:choose> 946 </xsl:otherwise> <!-- end not bomb-test=n --> 947 </xsl:choose> 948 </xsl:otherwise> 949 </xsl:choose> 950 </xsl:template> 951 961 952 </xsl:stylesheet> -
LFS/master.sh
r489bdc2 r5a8939e 126 126 # Insert instructions for unpacking the package and to set the PKGDIR variable. 127 127 LUSER_wrt_unpack "$pkg_tarball" 128 # If the testsuites must be run, initialize the log file 129 [[ "$TEST" = "3" ]] && LUSER_wrt_test_log "${this_script}" "$pkg_version" 128 # Always initialize the log file, since the test instructions may be 129 # "uncommented" by the user 130 LUSER_wrt_test_log "${this_script}" "$pkg_version" 130 131 # If using optimizations, write the instructions 131 132 [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" … … 250 251 fi 251 252 CHROOT_Unpack "$pkg_tarball" 252 # If the testsuites must be run, initialize the log file 253 case $name in 254 binutils | gcc | glibc | gmp | mpfr ) 255 [[ "$TEST" != "0" ]] && 256 CHROOT_wrt_test_log "${this_script}" "$pkg_version" 257 ;; 258 * ) 259 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && 260 CHROOT_wrt_test_log "${this_script}" "$pkg_version" 261 ;; 262 esac 253 # Always initialize the log file, so that the use may reinstate a 254 # commented out test 255 CHROOT_wrt_test_log "${this_script}" "$pkg_version" 263 256 # If using optimizations, write the instructions 264 257 [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
Note:
See TracChangeset
for help on using the changeset viewer.
