Remove the "Abort on testsuite failure" config (4)
Remove the bomb-testsuite param in lfs.xsl, with the associated code. This implies not passing this param in func_book_parser.
This commit is contained in:
parent
29615d9e3a
commit
594ff3d878
2 changed files with 25 additions and 58 deletions
32
LFS/lfs.xsl
32
LFS/lfs.xsl
|
@ -28,12 +28,6 @@
|
|||
-->
|
||||
<xsl:param name="testsuite" select="1"/>
|
||||
|
||||
<!-- Bomb on test suites failures?
|
||||
n = no, I want to build the full system and review the logs
|
||||
y = yes, bomb at the first test suite failure to can review the build dir
|
||||
-->
|
||||
<xsl:param name="bomb-testsuite" select="'n'"/>
|
||||
|
||||
<!-- Install non wide character ncurses 5? -->
|
||||
<xsl:param name="ncurses5" select="'n'"/>
|
||||
|
||||
|
@ -1120,8 +1114,6 @@ LOGLEVEL="</xsl:text>
|
|||
not(ancestor::sect1[@id='ch-system-binutils'])">
|
||||
<xsl:text># </xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when test="$bomb-testsuite = 'n'">
|
||||
<xsl:choose>
|
||||
<xsl:when test="contains(string(), 'make -k')">
|
||||
<xsl:value-of select="$instructions"/>
|
||||
|
@ -1151,30 +1143,6 @@ LOGLEVEL="</xsl:text>
|
|||
<xsl:text>
</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<!-- bomb-testsuite != 'n'-->
|
||||
<xsl:choose>
|
||||
<xsl:when test="contains($instructions, 'make -k')">
|
||||
<xsl:value-of select="$instructions"/>
|
||||
<xsl:if test="not($eof-seen)">
|
||||
<xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="$instructions"/>
|
||||
<xsl:if test="not(contains($instructions, '>>')) and
|
||||
not($eof-seen) and
|
||||
substring($instructions,
|
||||
string-length($instructions)) != '\'">
|
||||
<xsl:text> >> $TEST_LOG 2>&1</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:otherwise> <!-- end not bomb-test=n -->
|
||||
</xsl:choose>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
|
|
@ -77,7 +77,6 @@ extract_commands() { #
|
|||
# Use the profiled book for generating the scriptlets
|
||||
xsltproc --nonet \
|
||||
--stringparam testsuite "$TEST" \
|
||||
--stringparam bomb-testsuite "$BOMB_TEST" \
|
||||
--stringparam ncurses5 "$NCURSES5" \
|
||||
--stringparam strip "$STRIP" \
|
||||
--stringparam del-la-files "$DEL_LA_FILES" \
|
||||
|
|
Reference in a new issue