can now handle subdirs

diff --git a/ir/be/test/makehtml.xslt b/ir/be/test/makehtml.xslt
index 64d1850..1af6b6f 100644 (file)
--- a/ir/be/test/makehtml.xslt
+++ b/ir/be/test/makehtml.xslt
@@ -32,21 +32,26 @@
                                                <th>Firm Run</th>
                                                <th>Results</th>
                                        </tr>
-                                       <xsl:for-each select="/results/result">
+                                       <xsl:for-each select="/results/section">
                                                <tr>
-                                                       <td>
-                                                               <xsl:element name="a">
-                                                                       <xsl:attribute name="href">buildresult_<xsl:value-of select="@name"/>.txt</xsl:attribute>
-                                                                       <xsl:value-of select="@name"/>
-                                                               </xsl:element>
-                                                       </td>
-                                                       <td><xsl:apply-templates select="compile"/></td>
-                                                       <td><xsl:apply-templates select="link"/></td>
-                                                       <td><xsl:apply-templates select="gcc_compile"/></td>
-                                                       <td><xsl:apply-templates select="gcc_run"/></td>
-                                                       <td><xsl:apply-templates select="firm_run"/></td>
-                                                       <td><xsl:apply-templates select="diff"/></td>
+                                                   <th colspan="7" style="background-color: yellow; color: black;"><xsl:value-of select="@name"/></th>
                                                </tr>
+                                               <xsl:for-each select="result">
+                                                       <tr>
+                                                               <td>
+                                                                       <xsl:element name="a">
+                                                                               <xsl:attribute name="href">buildresult_<xsl:value-of select="@name"/>.txt</xsl:attribute>
+                                                                               <xsl:value-of select="@name"/>
+                                                                       </xsl:element>
+                                                               </td>
+                                                               <td><xsl:apply-templates select="compile"/></td>
+                                                               <td><xsl:apply-templates select="link"/></td>
+                                                               <td><xsl:apply-templates select="gcc_compile"/></td>
+                                                               <td><xsl:apply-templates select="gcc_run"/></td>
+                                                               <td><xsl:apply-templates select="firm_run"/></td>
+                                                               <td><xsl:apply-templates select="diff"/></td>
+                                                       </tr>
+                                               </xsl:for-each>
                                        </xsl:for-each>
                                </table>
                        </body>

diff --git a/ir/be/test/makereport.sh b/ir/be/test/makereport.sh
index 22bfdef..5c9b924 100755 (executable)
--- a/ir/be/test/makereport.sh
+++ b/ir/be/test/makereport.sh
@@ -1,5 +1,5 @@
-EDG_BIN="edg"
-EDG_CFLAGS="--c --gnu=400002 -I/usr/lib/gcc-lib/i686-pc-linux-gnu/4.1.1/include"
+EDG_BIN="edgcpfe"
+EDG_CFLAGS="--c --gnu=30305 -I/usr/lib/gcc-lib/i586-suse-linux/3.3.5/include"
 GCC_CFLAGS="-O3 -g -fomit-frame-pointer"
 LINKFLAGS="-lm"
 
@@ -23,7 +23,12 @@ __END__
 # so endless apps stop at some point...
 #ulimit -t2
 
-for file in ${CFILES}; do
+basedir=`pwd`
+
+for dir in . gcc-testsuite gcc-testsuite/ieee; do
+       curdir=$basedir/$dir
+    echo "<section name=\"$curdir/\">" >> $XMLRES
+for file in $curdir/$CFILES; do
     COMPILE_RES="ok"
     LINK_RES="omitted"
     GCC_RES="ok"
@@ -36,13 +41,13 @@ for file in ${CFILES}; do
     echo "Building $name"
     echo "Results for $name" > $res
     echo "*** EDG/FIRM Compile" >> $res
-    CMD="${EDG_BIN} ${EDG_CFLAGS} $file"
+    CMD="ulimit -t300 ; ${EDG_BIN} ${EDG_CFLAGS} $file"
     echo "$CMD" >> $res
-    $CMD >> $res 2>&1 || COMPILE_RES="failed"
+    /bin/bash -c "ulimit -t300 ; ${EDG_BIN} ${EDG_CFLAGS} $file" >> $res 2>&1 || COMPILE_RES="failed"
 
     if [ ${COMPILE_RES} == "ok" ]; then
         LINK_RES="ok"
-        CMD="mv $name.s build_firm/$name.s"
+        CMD="mv $curdir/$name.s build_firm/$name.s"
         echo "$CMD" >> $res
         $CMD >> $res 2>&1
         echo "*** Linking" >> $res
@@ -92,6 +97,8 @@ for file in ${CFILES}; do
         <diff>$DIFF_RES</diff>
     </result>
 __END__
+done
+    echo "</section>" >> $XMLRES
 done
 
 echo "</results>" >> $XMLRES