harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r566979 - in /harmony/enhanced/buildtest/branches/2.0/adaptors: jdktools-test/adaptor.xml snapshot/adaptor.xml snapshot/framework.local.properties
Date Fri, 17 Aug 2007 09:26:21 GMT
Author: smishura
Date: Fri Aug 17 02:26:20 2007
New Revision: 566979

URL: http://svn.apache.org/viewvc?view=rev&rev=566979
Log:
Add jdktools tests to snapshot testing

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml?view=diff&rev=566979&r1=566978&r2=566979
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml Fri Aug 17
02:26:20 2007
@@ -27,13 +27,54 @@
 
     <property name="tests.results.dir" value="${built.trunk.dir}/build/test_report"/>
 
-    <target name="run">
+    <target name="run" depends="-setup-jdktools-ws,-update-jdktools-ws">
         <exec-ant targets="test" dir="${built.trunk.dir}">
             <jvmarg line="${is.x86_64}"/>
             <sysproperty key="exclude.interm" value="true"/>
             <sysproperty key="test.jre.home" value="${tested.jre}"/>
             <sysproperty key="hy.test.timeout" value="6000000"/>
         </exec-ant>
+    </target>
+
+    <!--                                                    -->
+    <!-- Targets and properties related to snapshot testing -->
+    <!--                                                    -->
+    <condition property="is.snapshot">
+        <equals arg1="${jdktools-test.parameters.depends}"
+                arg2="snapshot"
+                trim="yes" />
+    </condition>
+
+    <condition property="is.checkout_ws">
+        <and>
+            <isset property="is.snapshot" />
+            <not>
+                <available file="${jdktools-test.parameters.required.hdk.trunk.dir}/build.xml"
/>
+            </not>
+        </and>
+    </condition>
+
+    <target name="-setup-jdktools-ws" if="is.checkout_ws">
+        <mkdir dir="${jdktools-test.parameters.required.hdk.trunk.dir}" />
+
+        <svn-co url="${jdktools-test.parameters.required.hdk.trunk.url}"
+                trunk="${jdktools-test.parameters.required.hdk.trunk.dir}" />
+        <exec-ant dir="${jdktools-test.parameters.required.hdk.trunk.dir}">
+            <jvmarg line="-Xmx1000M"/>
+            <sysproperty key="keep.working" value="true"/>
+            <sysproperty key="auto.fetch" value="true"/>
+            <sysproperty key="hy.cfg" value="release"/>
+        </exec-ant>
+    </target>
+
+    <target name="-update-jdktools-ws"
+            if="is.snapshot"
+            description="adjusts jdktools-tests to snapshots revision">
+        <loadproperties srcFile="${snapshot.svn.revision.file}" />
+        <exec executable="svn" dir="${built.trunk.dir}" failonerror="true">
+            <arg line="-r${svn.revision}" />
+            <arg line="update" />
+        </exec>
     </target>
 
 </project>

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=566979&r1=566978&r2=566979
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Fri Aug 17 02:26:20
2007
@@ -197,6 +197,15 @@
         <archive-result/>
     </target>
 
+    <target name="publish-jdktools-test">
+        <mkdir dir="${snapshot.results.dir}/jdktools-test" />
+        <copy todir="${snapshot.results.dir}/jdktools-test">
+            <fileset dir="${checkouts.dir}/hdk/working_jdktools/build/test_report/html">
+                <include name="**" />
+            </fileset>
+        </copy>
+    </target>
+
     <target name="publish-JettyScenario">
         <mkdir dir="${snapshot.results.dir}/JettyScenario" />
         <copy todir="${snapshot.results.dir}/JettyScenario">

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=566979&r1=566978&r2=566979
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties Fri
Aug 17 02:26:20 2007
@@ -49,6 +49,16 @@
 hdk_by_hdk.parameters.required.target.dir=${hdk_by_hdk.target.dir}
 
 #
+jdktools-test.parameters.depends=snapshot
+jdktools-test.parameters.required.tested.jre=${snapshot.parameters.shared.jre}
+jdktools-test.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
+
+jdktools-test.parameters.required.hdk.trunk.dir=${checkouts.dir}/hdk
+jdktools-test.parameters.required.hdk.trunk.url=https://svn.apache.org/repos/asf/harmony/enhanced/trunk
+jdktools-test.parameters.required.built.trunk.dir=${checkouts.dir}/hdk/working_jdktools
+jdktools-test.parameters.required.trunk.url=https://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk
+
+#
 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}



Mime
View raw message