Author: pierre Date: Sun Jan 7 12:20:12 2018 New Revision: 4020 Log: Always generate test instructions, and comment unwanted ones out. Fixes ticket #1695
Modified: jhalfs/trunk/Config.in jhalfs/trunk/LFS/lfs.xsl Modified: jhalfs/trunk/Config.in ============================================================================== --- jhalfs/trunk/Config.in Sun Jan 7 10:30:48 2018 (r4019) +++ jhalfs/trunk/Config.in Sun Jan 7 12:20:12 2018 (r4020) @@ -799,21 +799,23 @@ default y help #-- Run test suites - # + # If you select 'y' here: # You will have to select between: - # # - Only critical final system testsuites # - All final system testsuites # - Both temporary tools and final system testsuites - # - # HLFS and CLFS have no testsuites available in the - # temporary tools phase # You will be prompted also about the "flavour" of the # testsuites run: - # # - Don't stop on test suite failures # - Abort the build at the first test suite failure # + # Note that in any case, all the test instructions will + # be generated. Those which are not wanted will be commented + # out. If you select 'n' here, the commented test instructions + # do not stop on test suite failures. + # + # HLFS and CLFS have no testsuites available in the + # temporary tools phase menu "Test settings" depends CONFIG_TESTS @@ -826,17 +828,22 @@ help #-- Critical tests: # Only Glibc, Binutils, GMP, MPFR, MPC and GCC - # testsuites for final system + # testsuites for final system. The others are commented + # out. config TST_2 bool "All final system testsuites" + help + #-- All final system test suites: + # Test instructions for the temporary tools (if available) + # are commented out. config TST_3 bool "All testsuites" if !BOOK_HLFS && !BOOK_CLFS help #-- All tests: - # Runs all the testsuites for both temporary tools - # and final system + # Runs all the testsuites for both temporary tools (if + # available) and final system endchoice choice Modified: jhalfs/trunk/LFS/lfs.xsl ============================================================================== --- jhalfs/trunk/LFS/lfs.xsl Sun Jan 7 10:30:48 2018 (r4019) +++ jhalfs/trunk/LFS/lfs.xsl Sun Jan 7 12:20:12 2018 (r4020) @@ -411,88 +411,86 @@ </xsl:if> </xsl:when> <!-- test instructions --> - <xsl:when test="@remap = 'test'"> - <xsl:choose> - <xsl:when test="$testsuite = '0'"/> - <xsl:when test="$testsuite = '1' and + <xsl:when test="@remap = 'test'"> + <xsl:if test="$testsuite = '0' or + $testsuite = '1' and not(ancestor::sect1[@id='ch-system-gcc']) and not(ancestor::sect1[@id='ch-system-glibc']) and not(ancestor::sect1[@id='ch-system-gmp']) and not(ancestor::sect1[@id='ch-system-mpfr']) and - not(ancestor::sect1[@id='ch-system-binutils'])"/> - <xsl:when test="$testsuite = '2' and - ancestor::chapter[@id='chapter-temporary-tools']"/> + not(ancestor::sect1[@id='ch-system-binutils']) or + $testsuite = '2' and + ancestor::chapter[@id='chapter-temporary-tools']"> + <xsl:text># </xsl:text> + </xsl:if> + <xsl:choose> + <xsl:when test="$bomb-testsuite = 'n'"> + <xsl:choose> + <!-- special case for glibc --> + <xsl:when test="contains(string(), 'glibc-check-log')"> + <xsl:value-of + select="substring-before(string(),'2>&1')"/> + <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> + </xsl:when> + <!-- special case for procps-ng --> + <xsl:when test="contains(string(), 'pushd')"> + <xsl:text>{ </xsl:text> + <xsl:apply-templates/> + <xsl:text>; } >> $TEST_LOG 2>&1 || true
</xsl:text> + </xsl:when> + <xsl:when test="contains(string(), 'make -k')"> + <xsl:apply-templates/> + <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> + </xsl:when> + <xsl:when test="contains(string(), 'make')"> + <xsl:value-of select="substring-before(string(),'make')"/> + <xsl:text>make -k</xsl:text> + <xsl:value-of select="substring-after(string(),'make')"/> + <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + <xsl:if test="not(contains(string(), '>>'))"> + <xsl:text> >> $TEST_LOG 2>&1</xsl:text> + </xsl:if> + <xsl:text>
</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:when> <xsl:otherwise> + <!-- bomb-testsuite != 'n'--> <xsl:choose> - <xsl:when test="$bomb-testsuite = 'n'"> - <xsl:choose> - <!-- special case for glibc --> - <xsl:when test="contains(string(), 'glibc-check-log')"> - <xsl:value-of - select="substring-before(string(),'2>&1')"/> - <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> - </xsl:when> - <!-- special case for procps-ng --> - <xsl:when test="contains(string(), 'pushd')"> - <xsl:text>{ </xsl:text> - <xsl:apply-templates/> - <xsl:text>; } >> $TEST_LOG 2>&1 || true
</xsl:text> - </xsl:when> - <xsl:when test="contains(string(), 'make -k')"> - <xsl:apply-templates/> - <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> - </xsl:when> - <xsl:when test="contains(string(), 'make')"> - <xsl:value-of select="substring-before(string(),'make')"/> - <xsl:text>make -k</xsl:text> - <xsl:value-of select="substring-after(string(),'make')"/> - <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - <xsl:if test="not(contains(string(), '>>'))"> - <xsl:text> >> $TEST_LOG 2>&1</xsl:text> - </xsl:if> - <xsl:text>
</xsl:text> - </xsl:otherwise> - </xsl:choose> + <!-- special case for glibc --> + <xsl:when test="contains(string(), 'glibc-check-log')"> + <xsl:value-of + select="substring-before(string(),'2>&1')"/> + <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> + </xsl:when> + <!-- special case for gmp --> + <xsl:when test="contains(string(), 'tee gmp-check-log')"> + <xsl:text>(</xsl:text> + <xsl:apply-templates/> + <xsl:text>>> $TEST_LOG 2>&1 && exit $PIPESTATUS)
</xsl:text> + </xsl:when> + <!-- special case for procps-ng --> + <xsl:when test="contains(string(), 'pushd')"> + <xsl:text>{ </xsl:text> + <xsl:apply-templates/> + <xsl:text>; } >> $TEST_LOG 2>&1
</xsl:text> + </xsl:when> + <xsl:when test="contains(string(), 'make -k')"> + <xsl:apply-templates/> + <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> </xsl:when> <xsl:otherwise> - <!-- bomb-testsuite != 'n'--> - <xsl:choose> - <!-- special case for glibc --> - <xsl:when test="contains(string(), 'glibc-check-log')"> - <xsl:value-of - select="substring-before(string(),'2>&1')"/> - <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> - </xsl:when> - <!-- special case for gmp --> - <xsl:when test="contains(string(), 'tee gmp-check-log')"> - <xsl:text>(</xsl:text> - <xsl:apply-templates/> - <xsl:text>>> $TEST_LOG 2>&1 && exit $PIPESTATUS)
</xsl:text> - </xsl:when> - <!-- special case for procps-ng --> - <xsl:when test="contains(string(), 'pushd')"> - <xsl:text>{ </xsl:text> - <xsl:apply-templates/> - <xsl:text>; } >> $TEST_LOG 2>&1
</xsl:text> - </xsl:when> - <xsl:when test="contains(string(), 'make -k')"> - <xsl:apply-templates/> - <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - <xsl:if test="not(contains(string(), '>>'))"> - <xsl:text> >> $TEST_LOG 2>&1</xsl:text> - </xsl:if> - <xsl:text>
</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:apply-templates/> + <xsl:if test="not(contains(string(), '>>'))"> + <xsl:text> >> $TEST_LOG 2>&1</xsl:text> + </xsl:if> + <xsl:text>
</xsl:text> </xsl:otherwise> </xsl:choose> - </xsl:otherwise> + </xsl:otherwise> <!-- end not bomb-test=n --> </xsl:choose> </xsl:when> <!-- End of test instructions --> -- http://lists.linuxfromscratch.org/listinfo/alfs-log Unsubscribe: See the above information page