Re: Catching GMP test failures

[Pierre Labastie]

Le 09/02/2012 21:53, Pierre Labastie a écrit :

Le 09/02/2012 21:16, Matt Burgess a écrit :

The attached patch changes the command to:

make check 2>&1 | tee gmp-check-log>>   $TEST_LOG 2>&1&&   exit
$PIPESTATUS

Another way could be to eliminate any piping to tee during the tests
(testing the input line for '| tee'), since
the output is recorded anyway in $TEST_LOG...
I'd prefer this solution, otherwise we'd have to change how tests
are handled on a case by case basis each time the book adds
this kind of command (which was only in glibc when jhalfs was written)

Well,
The only places where there is a tee in the book are glibc and
gmp, and furthermore, the ouput of the tee is important
for the following awk command. So I propose to just add parentheses
to Matt's patch.
See attached

Regards
Pierre


Index: jhalfs-trunk/LFS/lfs.xsl
===================================================================
--- jhalfs-trunk.orig/LFS/lfs.xsl	2012-02-08 22:02:26.000000000 +0100
+++ jhalfs-trunk/LFS/lfs.xsl	2012-02-09 23:11:41.000000000 +0100
@@ -317,6 +317,11 @@
                        select="substring-before(string(),'2>&1')"/>
                     <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
                   </xsl:when>
+                  <xsl:when test="contains(string(), 'tee gmp-check-log')">
+                    <xsl:text>(</xsl:text>
+                    <xsl:apply-templates/>
+                    <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 &amp;&amp; exit $PIPESTATUS)&#xA;</xsl:text>
+                  </xsl:when>
 		  <xsl:when test="contains(string(), 'make -k')">
 		    <xsl:apply-templates/>
 		    <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>

-- 
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page