harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r566582 - in /harmony/enhanced/buildtest/branches/2.0/adaptors: hdk_by_hdk/adaptor.xml snapshot/adaptor.xml snapshot/framework.local.properties snapshot/suite-cc-custom-config.xml
Date Thu, 16 Aug 2007 09:05:31 GMT
Author: smishura
Date: Thu Aug 16 02:05:30 2007
New Revision: 566582

URL: http://svn.apache.org/viewvc?view=rev&rev=566582
Log:
Add ant scenario(hdk_by_hdk) to snapshot testing

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml?view=diff&rev=566582&r1=566581&r2=566582
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk_by_hdk/adaptor.xml Thu Aug 16 02:05:30
2007
@@ -17,14 +17,38 @@
 
 <project name="hdk_by_hdk" default="run" basedir=".">
 
-    <target name="setup"/>
     <property environment="env"/>
-    
+
     <!-- workaround: properties are case sensitive -->
     <!-- even the env. vars on OS are not          -->
     <property name="env.PATH" value="${env.Path}" />
-    
+
     <property name="my.path" value="${tested.jdk}/bin${path.separator}${env.PATH}"/>
+
+    <!-- if the suite is run against snapshot -->
+    <condition property="is.snapshot">
+        <equals arg1="${hdk_by_hdk.parameters.depends}"
+                arg2="snapshot"
+                trim="yes" />
+    </condition>
+
+    <condition property="is.checkout_ws">
+        <and>
+            <isset property="is.snapshot" />
+            <not>
+                <available file="${hdk_by_hdk.parameters.required.trunk.dir}/build.xml"
/>
+            </not>
+        </and>
+    </condition>
+
+    <target name="setup" depends="-setup-hdk-ws" />
+
+    <target name="-setup-hdk-ws" if="is.checkout_ws">
+        <mkdir dir="${hdk_by_hdk.parameters.required.trunk.dir}" />
+
+        <svn-co url="${hdk_by_hdk.parameters.required.trunk.url}"
+                trunk="${hdk_by_hdk.parameters.required.trunk.dir}" />
+    </target>
 
     <target name="run">
         <exec-ant dir="${trunk.dir}" javaVM="${tested.jdk}/bin/java">

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?view=diff&rev=566582&r1=566581&r2=566582
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Thu Aug 16 02:05:30
2007
@@ -262,6 +262,13 @@
         <archive-result/>
     </target>
 
+    <target name="publish-hdk_by_hdk">
+        <mkdir dir="${snapshot.results.dir}/hdk_by_hdk" />
+        <copy file="${cc.execution.log.file}"
+              tofile="${snapshot.results.dir}/hdk_by_hdk/index.html" />
+        <archive-result />
+    </target>
+
     <target name="publish-scimark">
         <mkdir dir="${snapshot.results.dir}/scimark" />
 
@@ -317,7 +324,7 @@
 
     <macrodef name="archive-result">
         <sequential>
-        <property file="${snapshot}/svn.revision" prefix="snapshot"/>
+            <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"/>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties?view=diff&rev=566582&r1=566581&r2=566582
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties Thu
Aug 16 02:05:30 2007
@@ -38,6 +38,17 @@
 gut.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
 
 #
+hdk_by_hdk.parameters.depends=snapshot
+hdk_by_hdk.parameters.required.tested.jdk=${snapshot.parameters.shared.jdk}
+hdk_by_hdk.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
+
+hdk_by_hdk.parameters.required.trunk.url=https://svn.apache.org/repos/asf/harmony/enhanced/trunk
+hdk_by_hdk.trunk.dir=${checkouts.dir}/hdk
+hdk_by_hdk.parameters.required.trunk.dir=${hdk_by_hdk.trunk.dir}
+hdk_by_hdk.target.dir=${checkouts.dir}/hdk/target.self-built
+hdk_by_hdk.parameters.required.target.dir=${hdk_by_hdk.target.dir}
+
+#
 JettyScenario.parameters.depends=snapshot
 JettyScenario.parameters.required.jetty.server.jvm=${snapshot.parameters.shared.jvm.location}
 JettyScenario.parameters.required.scenario.framework.jvm=${snapshot.parameters.shared.jvm.location}

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?view=diff&rev=566582&r1=566581&r2=566582
==============================================================================
--- 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 Thu
Aug 16 02:05:30 2007
@@ -64,6 +64,7 @@
                 <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='cc.execution.log.file' value='${cc.execution.log.file}'/>
             </antpublisher>
         </publishers>
 



Mime
View raw message