zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove the "Abort on testsuite failure" config (4)

Browse source 
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:
Pierre Labastie 2022-06-15 15:10:52 +02:00
parent 29615d9e3a
commit 594ff3d878
2 changed files with 25 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
LFS/lfs.xsl
View file

@ -28,12 +28,6 @@
--> -->
<xsl:param name="testsuite" select="1"/> <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? --> <!-- Install non wide character ncurses 5? -->
<xsl:param name="ncurses5" select="'n'"/> <xsl:param name="ncurses5" select="'n'"/>
@ -1121,59 +1115,33 @@ LOGLEVEL="</xsl:text>
<xsl:text># </xsl:text> <xsl:text># </xsl:text>
</xsl:if> </xsl:if>
<xsl:choose> <xsl:choose>
<xsl:when test="$bomb-testsuite = 'n'"> <xsl:when test="contains(string(), 'make -k')">
<xsl:choose> <xsl:value-of select="$instructions"/>
<xsl:when test="contains(string(), 'make -k')"> <xsl:if test="not($eof-seen)">
<xsl:value-of select="$instructions"/> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
<xsl:if test="not($eof-seen)"> </xsl:if>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:if> </xsl:when>
<xsl:text>&#xA;</xsl:text> <xsl:when test="contains($instructions, 'make')">
</xsl:when> <xsl:value-of select="substring-before($instructions, 'make')"/>
<xsl:when test="contains($instructions, 'make')"> <xsl:text>make -k</xsl:text>
<xsl:value-of select="substring-before($instructions, 'make')"/> <xsl:value-of select="substring-after($instructions, 'make')"/>
<xsl:text>make -k</xsl:text> <xsl:if test="not($eof-seen)">
<xsl:value-of select="substring-after($instructions, 'make')"/> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
<xsl:if test="not($eof-seen)"> </xsl:if>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$instructions"/>
<xsl:if
test="not(contains($instructions, '&gt;&gt;')) and
not($eof-seen) and
substring($instructions,
string-length($instructions)) != '\'">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<!-- bomb-testsuite != 'n'--> <xsl:value-of select="$instructions"/>
<xsl:choose> <xsl:if
<xsl:when test="contains($instructions, 'make -k')"> test="not(contains($instructions, '&gt;&gt;')) and
<xsl:value-of select="$instructions"/> not($eof-seen) and
<xsl:if test="not($eof-seen)"> substring($instructions,
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text> string-length($instructions)) != '\'">
</xsl:if> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
<xsl:text>&#xA;</xsl:text> </xsl:if>
</xsl:when> <xsl:text>&#xA;</xsl:text>
<xsl:otherwise> </xsl:otherwise>
<xsl:value-of select="$instructions"/>
<xsl:if test="not(contains($instructions, '&gt;&gt;')) and
not($eof-seen) and
substring($instructions,
string-length($instructions)) != '\'">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise> <!-- end not bomb-test=n -->
</xsl:choose> </xsl:choose>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>

1
common/libs/func_book_parser
View file

@ -77,7 +77,6 @@ extract_commands() { #
# Use the profiled book for generating the scriptlets # Use the profiled book for generating the scriptlets
xsltproc --nonet \ xsltproc --nonet \
--stringparam testsuite "$TEST" \ --stringparam testsuite "$TEST" \
--stringparam bomb-testsuite "$BOMB_TEST" \
--stringparam ncurses5 "$NCURSES5" \ --stringparam ncurses5 "$NCURSES5" \
--stringparam strip "$STRIP" \ --stringparam strip "$STRIP" \
--stringparam del-la-files "$DEL_LA_FILES" \ --stringparam del-la-files "$DEL_LA_FILES" \