svn commit: r574498 - in /harmony/enhanced/buildtest/branches/2.0: adaptors/snapshot/adaptor.xml tests/eut/build.xml

[sm...@apache.org]

Author: smishura
Date: Tue Sep 11 00:44:24 2007
New Revision: 574498

URL: http://svn.apache.org/viewvc?rev=574498&view=rev
Log:
Eclipse unit test reporting: only copy output.txt, report.txt and html files

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/tests/eut/build.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=574498&r1=574497&r2=574498&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Tue Sep 11 00:44:24 2007
@@ -301,23 +301,11 @@
     <target name="publish-eut">
         <mkdir dir="${snapshot.results.dir}/eut" />
 
-        <!-- get all EUT html report files into index.html -->
+        <!-- copy all EUT report files -->
         <copy todir="${snapshot.results.dir}/eut">
             <fileset dir="${results.dir}/eut/latest"/>
         </copy>
 
-        <dirset id="eut.dir.id" dir="${snapshot.results.dir}/eut" includes="*" />
-        <property name="eut.html.files" refid="eut.dir.id" />
-        <echo file="${snapshot.results.dir}/eut/index.html">
-&lt;html&gt;
-${eut.html.files};
-&lt;/html&gt;
-        </echo>
-        <replaceregexp file="${snapshot.results.dir}/eut/index.html"
-                       flags="g"
-                       match="([^;>]*);"
-                       replace="&lt;a href=\1&gt;\1&lt;/a&gt;&lt;br/&gt;" />
-
         <touch-status-file />
         <archive-result />
     </target>
@@ -325,22 +313,10 @@
     <target name="publish-eut33">
         <mkdir dir="${snapshot.results.dir}/eut33" />
 
-        <!-- get all EUT html report files into index.html -->
+        <!-- copy all EUT report files -->
         <copy todir="${snapshot.results.dir}/eut33">
             <fileset dir="${results.dir}/eut33/latest"/>
         </copy>
-
-        <dirset id="eut.dir.id" dir="${snapshot.results.dir}/eut33" includes="*" />
-        <property name="eut.html.files" refid="eut.dir.id" />
-        <echo file="${snapshot.results.dir}/eut33/index.html">
-&lt;html&gt;
-${eut.html.files};
-&lt;/html&gt;
-        </echo>
-        <replaceregexp file="${snapshot.results.dir}/eut33/index.html"
-                       flags="g"
-                       match="([^;>]*);"
-                       replace="&lt;a href=\1&gt;\1&lt;/a&gt;&lt;br/&gt;" />
 
         <touch-status-file />
         <archive-result />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml?rev=574498&r1=574497&r2=574498&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml Tue Sep 11 00:44:24 2007
@@ -481,7 +481,11 @@
         <delete dir="${result.dir}/latest"/>
         <mkdir dir="${result.dir}/latest"/>
         <copy todir="${result.dir}/latest">
-            <fileset dir="${res.dir}/results/html"/>
+            <fileset dir="${res.dir}">
+                <include name="results/html/*.html"/>
+                <include name="output.txt"/>
+                <include name="report.txt"/>
+            </fileset>
         </copy>
     </target>