svn commit: r615132 - in /harmony/enhanced/buildtest/branches/2.0: adaptors/gut/parameters.xml adaptors/snapshot/adaptor.xml tests/gut/build.xml

[sm...@apache.org]

Author: smishura
Date: Thu Jan 24 23:09:42 2008
New Revision: 615132

URL: http://svn.apache.org/viewvc?rev=615132&view=rev
Log:
Make snapshot adaptor and GUT build consistent

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/tests/gut/build.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml?rev=615132&r1=615131&r2=615132&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml Thu Jan 24 23:09:42 2008
@@ -60,7 +60,7 @@
     <cc>
         <summary
             description="Geronimo tests report to attach to CC notification"
-            value="${test.sources.dir}/${suite.name}/report.txt"/>
+            value="${result.dir}/${suite.name}/latest/report.txt"/>
     </cc>
 
 </parameters>

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=615132&r1=615131&r2=615132&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Thu Jan 24 23:09:42 2008
@@ -350,15 +350,9 @@
         <archive-result />
     </target>
 
-    <target name="publish-gut">
-        <mkdir dir="${snapshot.results.dir}/gut" />
-        <junitreport todir="${checkouts.dir}/gut/logs">
-            <fileset dir="${checkouts.dir}/gut/geronimo-2.0.2"
-                     includes="**/surefire-reports/TEST*-*.xml" />
-            <report format="frames" todir="${snapshot.results.dir}/gut" />
-        </junitreport>
-        <archive-result/>
-    </target>
+    <!-- Geronimo Unit Tests -->
+    <property name="gut.report" value="${results.dir}/gut/latest/html" />
+    <target name="publish-gut" depends="-copy-report-files" />
 
     <!-- ANT testing scenario -->
     <target name="publish-hdk_by_hdk" depends="-copy-report-files" />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/gut/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/gut/build.xml?rev=615132&r1=615131&r2=615132&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/gut/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/gut/build.xml Thu Jan 24 23:09:42 2008
@@ -36,10 +36,8 @@
 
     <property name="maven.repository" location="${work.dir}/.m2"/>
 
-    <condition property="res.dir" value="${result.dir}/${timestamp}"
-        else="${basedir}/results/${timestamp}">
-        <isset property="result.dir" />
-    </condition>
+    <property name="result.dir" value="${basedir}/results" />
+    <property name="res.dir" value="${result.dir}/${timestamp}" />
 
     <!-- Geronimo working directory -->
     <property name="geronimo.dir"
@@ -403,6 +401,12 @@
                      includes="**/surefire-reports/TEST*-*.xml"/>
             <report format="frames" todir="${html.reports.dir}"/>
         </junitreport>
+
+        <!-- copy the latest report -->
+        <delete dir="${result.dir}/latest" />
+        <copy todir="${result.dir}/latest">
+            <fileset dir="${res.dir}" />
+        </copy>
     </target>
 
     <target name="run"