jhalfs git · trunk
jhalfs LFS build automation (mirror)
Python 78.4% Shell 19.8% Makefile 1.8%git clone https://git.christianimmanuel.de/mirrors-forks/jhalfs.gitwget https://git.christianimmanuel.de/mirrors-forks/jhalfs/archive/jhalfs.tar.gzRemove 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.
LFS/lfs.xsl | 82 ++++++++++++++------------------------------ common/libs/func_book_parser | 1 - 2 files changed, 25 insertions(+), 58 deletions(-) diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl index c1ccdcc..c6075d6 100644 --- a/LFS/lfs.xsl +++ b/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'"/> @@ -1121,59 +1115,33 @@ LOGLEVEL="</xsl:text> <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"/> - <xsl:if test="not($eof-seen)"> - <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text> - </xsl:if> - <xsl:text>
</xsl:text> - </xsl:when> - <xsl:when test="contains($instructions, 'make')"> - <xsl:value-of select="substring-before($instructions, 'make')"/> - <xsl:text>make -k</xsl:text> - <xsl:value-of select="substring-after($instructions, 'make')"/> - <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 || true</xsl:text> - </xsl:if> - <xsl:text>
</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:when test="contains(string(), '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:when test="contains($instructions, 'make')"> + <xsl:value-of select="substring-before($instructions, 'make')"/> + <xsl:text>make -k</xsl:text> + <xsl:value-of select="substring-after($instructions, 'make')"/> + <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> - <!-- 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: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 || true</xsl:text> + </xsl:if> + <xsl:text>
</xsl:text> + </xsl:otherwise> </xsl:choose> </xsl:otherwise> </xsl:choose> diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser index c5d8c02..229cee0 100644 --- a/common/libs/func_book_parser +++ b/common/libs/func_book_parser @@ -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" \