svn commit: r605849 - /harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml

[sm...@apache.org]

Author: smishura
Date: Thu Dec 20 01:42:36 2007
New Revision: 605849

URL: http://svn.apache.org/viewvc?rev=605849&view=rev
Log:
Change publisher for functional suite:
Instead of full JUnit report execution log is provided (+ JUnit report for failed tests)

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml?rev=605849&r1=605848&r2=605849&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Thu Dec 20 01:42:36 2007
@@ -271,13 +271,37 @@
     </target>
 
     <target name="publish-func">
-        <delete dir="${snapshot.results.dir}/func" />
-        <mkdir dir="${snapshot.results.dir}/func" />
+
+        <mkdir dir="${snapshot.results.dir}/func/junit" />
+        <touch-status-file />
+
+        <!-- copy execurtion log -->
+        <concat destfile="${snapshot.results.dir}/func/index.html">
+
+            <!-- insert link to junit report -->
+            <header trimleading="yes" filtering="no">
+                &lt;html&gt;&lt;body&gt;&lt;pre&gt;
+                &lt;a href=&quot;junit/index.html&quot;&gt;JUnit report for failures&lt;a&gt;&#xA;&#xA;
+            </header>
+
+            <fileset file="${results.dir}/func/th.log" />
+
+            <footer trimleading="yes" filtering="no">
+                &lt;/pre&gt;&lt;/body&gt;&lt;/html&gt;
+            </footer>
+        </concat>
+
+        <!-- generate junit report only for failed tests -->
         <junitreport todir="${snapshot.results.dir}/func">
-            <fileset dir="${results.dir}/func" includes="TEST*-*.xml" />
-            <report format="frames" todir="${snapshot.results.dir}/func" />
+            <fileset dir="${results.dir}/func" includes="TEST*-*.xml">
+                <containsregexp expression='(errors|failures)=.[1-9]' />
+                <exclude name="TESTS-TestSuites.xml" />
+            </fileset>
+            <report format="frames"
+                    todir="${snapshot.results.dir}/func/junit" />
         </junitreport>
-        <archive-result/>
+
+        <archive-result />
     </target>
 
     <property name="jdktools-test.report"