svn commit: r570027 - in /harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot: adaptor.xml parameters.xml suite-cc-custom-config.xml

[sm...@apache.org]

Author: smishura
Date: Mon Aug 27 01:11:11 2007
New Revision: 570027

URL: http://svn.apache.org/viewvc?rev=570027&view=rev
Log:
Snapshot testing: archive test results in separate zip for each suite & don't delete previous

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.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=570027&r1=570026&r2=570027&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Mon Aug 27 01:11:11 2007
@@ -79,10 +79,18 @@
         <contains string="${snapshot.file}" substring=".zip" />
     </condition>
 
-    <property name="snapshot.results.dir" location="${snapshot}/results" />
+    <!-- result dir -->
+    <condition property="platform.prefix" value="Windows" else="Linux">
+        <isset property="is.windows" />
+    </condition>
+    <condition property="platform.sufix" value="x86_64" else="x86">
+        <isset property="is.x86_64" />
+    </condition>
+    <property file="${snapshot.svn.revision.file}" />
+    <property name="snapshot.results.dir"
+              location="${snapshot}/results/r${svn.revision}/${platform.prefix}_${platform.sufix}" />
 
     <target name="run" depends="-unzip,-gunzip,-svn.revision">
-        <delete dir="${snapshot.results.dir}" />
         <mkdir dir="${snapshot.results.dir}" />
     </target>
 
@@ -343,10 +351,11 @@
 
     <macrodef name="archive-result">
         <sequential>
-            <property file="${snapshot}/svn.revision" prefix="snapshot"/>
-            <zip destfile="${cc.log.dir}/snapshot-r${snapshot.svn.revision}.status.zip"
-                 basedir="${snapshot.results.dir}"
-                 update="true"/>
+            <mkdir dir="${snapshot.arch.dir}/r${svn.revision}" />
+            <zip destfile="${snapshot.arch.dir}/r${svn.revision}/snapshot-r${svn.revision}.${platform.prefix}_${platform.sufix}.${projectname}-status.zip"
+                 basedir="${snapshot}/results"
+                 includes="r${svn.revision}/${platform.prefix}_${platform.sufix}/${projectname}/**"
+                 update="true" />
         </sequential>
     </macrodef>
 

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml?rev=570027&r1=570026&r2=570027&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml Mon Aug 27 01:11:11 2007
@@ -2,6 +2,7 @@
 
     <shared>
         <results.dir value="${checkouts.dir}/snapshot/results"/>
+        <arch.dir value="${cc.log.dir}"/>
         <jre value="${checkouts.dir}/snapshot/hdk/jdk/jre"/>
         <jdk value="${checkouts.dir}/snapshot/hdk/jdk"/>
         <jvm.location value="${checkouts.dir}/snapshot/hdk/jdk/jre/bin/java${exe}"/>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml?rev=570027&r1=570026&r2=570027&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml Mon Aug 27 01:11:11 2007
@@ -64,6 +64,8 @@
                 <property name='results.dir' value='${results.dir}'/>
                 <property name='checkouts.dir' value='${checkouts.dir}'/>
                 <property name='cc.log.dir' value='${cc.log.dir}'/>
+                <property name='snapshot.svn.revision.file' value='${snapshot.svn.revision.file}'/>
+                <property name='snapshot.arch.dir' value='${snapshot.arch.dir}'/>
                 <property name='cc.execution.log.file' value='${cc.execution.log.file}'/>
             </antpublisher>
         </publishers>