[jhalfs] branch trunk updated: Comment out "cat vim-test.log" when tests disabled
"Git Owner" ([email protected] via alfs-discuss Mailing List) <[email protected]> Sat, 08 Feb 2025 17:53:27 +0000
| Newsgroups | gmane.linux.lfs.automated |
|---|---|
| Message-ID | <173903720725.2269.287221861179440101@rivendell.linuxfromscratch.org> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch trunk
in repository jhalfs.
The following commit(s) were added to refs/heads/trunk by this push:
new 3482b3c Comment out "cat vim-test.log" when tests disabled
3482b3c is described below
commit 3482b3c16b9e77653f6cb79d64ac0da8b04f6c51
Author: Pierre Labastie <[email protected]>
AuthorDate: Sat Feb 8 18:46:10 2025 +0100
Comment out "cat vim-test.log" when tests disabled
We recently added a line after vim tests to copy logs to $TEST_LOG.
Problem is that vim-tests.log is not created if the tests are not run
but the line is never commented out. This leads to an error...
The idea is just to call the template again with
"cat vim-tests.log". This will comment out the line when needed,
always redirect vim-tests.log and any error to $TEST_LOGS,
and not stop on error.
Fix bug reported in
https://lists.linuxfromscratch.org/sympa/arc/alfs-discuss/2025-02/msg00011.html
---
LFS/lfs.xsl | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 648b541..85baa8d 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -1174,9 +1174,13 @@ LOGLEVEL="</xsl:text>
</xsl:otherwise>
</xsl:choose>
<xsl:text>
</xsl:text>
- <xsl:if test="contains($instructions,'vim-test.log')">
- <xsl:text>cat vim-test.log >> $TEST_LOG
-</xsl:text>
+ <xsl:if test="contains(normalize-space($instructions),
+ '&> vim-test.log')">
+ <xsl:call-template name="comment-test">
+ <xsl:with-param name="instructions"
+ select="'cat vim-test.log'"/>
+ <xsl:with-param name="eof-seen" select="$eof-seen"/>
+ </xsl:call-template>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page