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

Allows having << EOF in tests, and not generating >> $TEST_LOG... until the

Browse source 
matching EOF is found.
This commit is contained in:
Pierre Labastie 2020-05-31 07:31:32 +00:00
parent 9728b235e6
commit 6caa5b8816
1 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
LFS/lfs.xsl
View file

@ -1080,17 +1080,32 @@ LOGLEVEL="</xsl:text>
<xsl:template name="comment-test"> <xsl:template name="comment-test">
<xsl:param name="instructions" select="''"/> <xsl:param name="instructions" select="''"/>
<xsl:param name="eof-seen" select="false()"/>
<xsl:choose> <xsl:choose>
<xsl:when test="contains($instructions,'&#xA;')"> <xsl:when test="contains($instructions,'&#xA;')">
<xsl:call-template name="comment-test"> <xsl:call-template name="comment-test">
<xsl:with-param name="instructions" <xsl:with-param name="instructions"
select="substring-before($instructions,'&#xA;')"/> select="substring-before($instructions,'&#xA;')"/>
<xsl:with-param name="eof-seen" select="$eof-seen"/>
</xsl:call-template> </xsl:call-template>
<xsl:choose>
<xsl:when test="contains(substring-before($instructions,'&#xA;'),
'EOF')">
<xsl:call-template name="comment-test"> <xsl:call-template name="comment-test">
<xsl:with-param name="instructions" <xsl:with-param name="instructions"
select="substring-after($instructions,'&#xA;')"/> select="substring-after($instructions,'&#xA;')"/>
<xsl:with-param name="eof-seen" select="not($eof-seen)"/>
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:otherwise>
<xsl:call-template name="comment-test">
<xsl:with-param name="instructions"
select="substring-after($instructions,'&#xA;')"/>
<xsl:with-param name="eof-seen" select="$eof-seen"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:if test="$testsuite = '0' or <xsl:if test="$testsuite = '0' or
$testsuite = '1' and $testsuite = '1' and
@ -1108,21 +1123,28 @@ LOGLEVEL="</xsl:text>
<xsl:choose> <xsl:choose>
<xsl:when test="contains(string(), 'make -k')"> <xsl:when test="contains(string(), 'make -k')">
<xsl:value-of select="$instructions"/> <xsl:value-of select="$instructions"/>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text> <xsl:if test="not($eof-seen)">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
<xsl:when test="contains($instructions, 'make')"> <xsl:when test="contains($instructions, 'make')">
<xsl:value-of select="substring-before($instructions, 'make')"/> <xsl:value-of select="substring-before($instructions, 'make')"/>
<xsl:text>make -k</xsl:text> <xsl:text>make -k</xsl:text>
<xsl:value-of select="substring-after($instructions, 'make')"/> <xsl:value-of select="substring-after($instructions, 'make')"/>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text> <xsl:if test="not($eof-seen)">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="$instructions"/> <xsl:value-of select="$instructions"/>
<xsl:if <xsl:if
test="not(contains($instructions, '&gt;&gt;')) and test="not(contains($instructions, '&gt;&gt;')) and
not($eof-seen) and
substring($instructions, substring($instructions,
string-length($instructions)) != '\'"> string-length($instructions)) != '\'">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if> </xsl:if>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:otherwise> </xsl:otherwise>
@ -1133,11 +1155,15 @@ LOGLEVEL="</xsl:text>
<xsl:choose> <xsl:choose>
<xsl:when test="contains($instructions, 'make -k')"> <xsl:when test="contains($instructions, 'make -k')">
<xsl:value-of select="$instructions"/> <xsl:value-of select="$instructions"/>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text> <xsl:if test="not($eof-seen)">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="$instructions"/> <xsl:value-of select="$instructions"/>
<xsl:if test="not(contains($instructions, '&gt;&gt;')) and <xsl:if test="not(contains($instructions, '&gt;&gt;')) and
not($eof-seen) and
substring($instructions, substring($instructions,
string-length($instructions)) != '\'"> string-length($instructions)) != '\'">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text>