harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r649425 - in /harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test: adaptor.xml parameters.xml
Date Fri, 18 Apr 2008 09:28:53 GMT
Author: smishura
Date: Fri Apr 18 02:28:40 2008
New Revision: 649425

URL: http://svn.apache.org/viewvc?rev=649425&view=rev
Log:
Update JDKTools adaptor:
* add parameters for SVN
* make it as standalone suite
* move clean,fetch-depends,rebuild to 'run' target 

Modified:
    harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml?rev=649425&r1=649424&r2=649425&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml Fri Apr 18 02:28:40
2008
@@ -20,12 +20,33 @@
     <property name="tests.results.dir"
               value="${built.trunk.dir}/build/test_report" />
 
+    <target name="setup" />
+
     <target name="run" depends="-setup-jdktools-ws,-update-jdktools-ws">
-        <ant target="test" dir="${built.trunk.dir}">
-            <property name="exclude.interm" value="true" />
-            <property name="test.jre.home" value="${tested.jre}" />
-            <property name="hy.test.timeout" value="6000000" />
-        </ant>
+
+        <!-- Do clean first (even before rebuild) -->
+        <!-- to remove previous results           -->
+        <exec-ant targets="clean-tests" dir="${built.trunk.dir}">
+            <sysproperty key="hy.hdk"
+                         value="${jdktools-test.parameters.required.hy.hdk}" />
+        </exec-ant>
+
+        <ant target="fetch-depends"
+             dir="${built.trunk.dir}"
+             inheritAll="false" />
+
+        <exec-ant targets="rebuild" dir="${built.trunk.dir}">
+            <sysproperty key="hy.hdk"
+                         value="${jdktools-test.parameters.required.hy.hdk}" />
+        </exec-ant>
+
+        <exec-ant targets="test" dir="${built.trunk.dir}">
+            <sysproperty key="hy.hdk"
+                         value="${jdktools-test.parameters.required.hy.hdk}" />
+            <sysproperty key="exclude.interm" value="true" />
+            <sysproperty key="test.jre.home" value="${tested.jre}" />
+            <sysproperty key="hy.test.timeout" value="6000000" />
+        </exec-ant>
     </target>
 
     <!--                                                    -->
@@ -57,10 +78,6 @@
             if="is.snapshot"
             description="adjusts jdktools-tests to snapshots revision">
 
-        <!-- Do clean first (even before rebuild) -->
-        <!-- to remove previous results           -->
-        <ant target="clean-tests" dir="${built.trunk.dir}" inheritAll="false" />
-
         <loadproperties srcFile="${snapshot.svn.revision.file}" />
         <exec executable="svn"
               dir="${jdktools-test.parameters.required.hdk.trunk.dir}"
@@ -71,15 +88,6 @@
             <arg line="build.xml" />
         </exec>
 
-        <!-- FIXME: need to rebuild hdk before testing      -->
-        <!-- it is shared with hdk_by_hdk and may be broken -->
-        <exec-ant dir="${jdktools-test.parameters.required.hdk.trunk.dir}">
-            <jvmarg line="-Xmx1000M" />
-            <sysproperty key="svn.revision" value="${svn.revision}" />
-            <sysproperty key="keep.working" value="true" />
-            <sysproperty key="auto.fetch" value="true" />
-            <sysproperty key="hy.cfg" value="release" />
-        </exec-ant>
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml?rev=649425&r1=649424&r2=649425&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml Fri Apr 18
02:28:40 2008
@@ -19,16 +19,26 @@
 <parameters depends="hdk">
 
     <required>
+
+        <!-- FIXME: switch to using DRLVM by default -->
+        <hy.hdk description="Harmony HDK root dir" 
+            value="${hdk.parameters.shared.trunk.dir}/target/hdk" />
         <tested.jre description="Path to JRE under test" 
-            value="${hdk.parameters.shared.binaries.jre.dir}" />
+            value="${jdktools-test.parameters.required.hy.hdk}/jdk/jre" />
+
+        <!-- FIXME: should point to ${svn.jdktools.dir} value -->
         <built.trunk.dir description="Path to built HY JDK Tools trunk" 
-            value="${hdk.parameters.shared.jdktools.trunk.dir}" />
+            value="${checkouts.dir}/jdktools" />
     </required>
     
     <optional>
         <tested.jre.options description="Options for tested JRE" 
             value="-showversion"/>
     </optional>
+
+    <svn>
+      <jdktools url="http://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk"
/>
+    </svn>
 
     <cc results="${tests.results.dir}' pattern='TEST-*.xml"/>
 



Mime
View raw message