harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r652238 - in /harmony/enhanced/buildtest/trunk/infra/adaptors: drlvm-reg-test/ drlvm-test/ jdktools-test/ snapshot/
Date Wed, 30 Apr 2008 03:20:55 GMT
Author: smishura
Date: Tue Apr 29 20:20:55 2008
New Revision: 652238

URL: http://svn.apache.org/viewvc?rev=652238&view=rev
Log:
Update drlvm-(reg-)test & jdktools-test adaptors to use flashed svn properties

Modified:
    harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/parameters.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/parameters.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml?rev=652238&r1=652237&r2=652238&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml Tue Apr 29
20:20:55 2008
@@ -33,17 +33,49 @@
             <fileset dir="${drlvm-reg-test.results.dir}" includes="**/*" />
         </delete>
 
+        <!-- time of the current test run -->
+        <tstamp>
+            <format property="drlvm-reg-test.run.time"
+                    pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+
+        <!-- clean & fetch-depends -->
+        <exec-ant dir="${drlvm-reg-test.parameters.svn.drlvm.location}"
+                  targets="clean fetch-depends"
+                  failonerror="true">
+
+            <sysproperty key="hy.cfg" value="${drlvm.config}" />
+            <sysproperty key="common.resources.loc"
+                         value="${drlvm-reg-test.parameters.svn.common_resources.location}"
/>
+        </exec-ant>
+
         <!-- launch the tests -->
-        <exec-ant dir="${built.drlvm.trunk}"
+        <exec-ant dir="${drlvm-reg-test.parameters.svn.drlvm.location}"
                   targets="reg.test"
                   failonerror="false"
                   failproperty="drlvm-reg-test.run.failed">
+
             <sysproperty key="hy.cfg" value="${drlvm.config}" />
+            <sysproperty key="test.hdk.home"
+                         value="${drlvm-reg-test.parameters.required.hy.hdk}" />
             <sysproperty key="common.resources.loc"
-                         value="${common.resources}" />
-            <arg line="${tested.hdk.param}" />
+                         value="${drlvm-reg-test.parameters.svn.common_resources.location}"
/>
         </exec-ant>
 
+        <!-- define the resulting files -->
+        <fileset id="drlvm-reg-test.results.set"
+                 dir="${drlvm-reg-test.parameters.svn.drlvm.location}/build"
+                 includes="*${drlvm.config}/**/TEST-*.xml">
+            <date datetime="${drlvm-reg-test.run.time}"
+                  pattern="yyyyMMdd_HHmm"
+                  when="after" />
+        </fileset>
+
+        <copy todir="${drlvm-reg-test.results.dir}">
+            <fileset refid="drlvm-reg-test.results.set" />
+            <packagemapper from="*" to="*" />
+        </copy>
+
         <fail message="There were drlvm-reg-test failures"
               if="drlvm-reg-test.run.failed" />
     </target>
@@ -58,33 +90,23 @@
                 trim="yes" />
     </condition>
 
-    <condition property="tested.hdk.param"
-               value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}"
-               else="">
-        <isset property="is.snapshot" />
-    </condition>
-
     <target name="-update"
             if="is.snapshot"
             description="adjusts tests to snapshot revision">
-        <mkdir dir="${built.drlvm.trunk}" />
-        <mkdir dir="${common.resources}" />
-        <loadproperties srcFile="${snapshot.svn.revision.file}" />
-        <exec executable="svn" dir="${common.resources}" failonerror="true">
-            <arg line="co -r${svn.revision} ${common.resources.url} ." />
-        </exec>
-        <exec executable="svn" dir="${built.drlvm.trunk}" failonerror="true">
-            <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
+
+        <exec executable="svn"
+              dir="${drlvm-reg-test.parameters.svn.common_resources.location}"
+              failonerror="true">
+
+            <arg line="up -r${svn.revision} ." />
         </exec>
 
-        <exec-ant dir="${built.drlvm.trunk}"
-                  targets="clean fetch-depends"
-                  failonerror="true">
-            <sysproperty key="hy.cfg" value="${drlvm.config}" />
-            <sysproperty key="common.resources.loc"
-                         value="${common.resources}" />
-        </exec-ant>
+        <exec executable="svn"
+              dir="${drlvm-reg-test.parameters.svn.drlvm.location}"
+              failonerror="true">
 
+            <arg line="up -r${svn.revision} ." />
+        </exec>
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/parameters.xml?rev=652238&r1=652237&r2=652238&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/parameters.xml Tue Apr
29 20:20:55 2008
@@ -16,20 +16,21 @@
      limitations under the License. 
 -->
 
-<parameters depends="classlib,drlvm">
+<parameters depends="drlvm">
 
     <required>
-        <built.drlvm.trunk 
-            description="Path to built drlvm trunk"
-            value="${drlvm.parameters.shared.trunk.dir}" />
-        <common.resources description="Path to shared pool" 
-            value="${built.drlvm.trunk}/../common_resources"
-            url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources/trunk"/>
+        <hy.hdk description="Harmony HDK root dir" 
+            value="${drlvm.parameters.svn.drlvm.location}/deploy" />
         <drlvm.config
             description="The built drlvm configuration (debug/release)"
             value="${drlvm.parameters.shared.build.config}"/>
     </required>
 
+    <svn>
+      <drlvm url="http://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk" />
+      <common_resources url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources/trunk"/>
+    </svn>
+
     <cc 
         results="${drlvm-reg-test.results.dir}"
     />

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml?rev=652238&r1=652237&r2=652238&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml Tue Apr 29 20:20:55
2008
@@ -33,20 +33,50 @@
             <fileset dir="${drlvm-test.results.dir}" includes="**/*" />
         </delete>
 
+        <!-- time of the current test run -->
+        <tstamp>
+            <format property="drlvm-test.run.time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+
+        <exec-ant dir="${drlvm-test.parameters.svn.drlvm.location}"
+                  targets="clean fetch-depends"
+                  failonerror="true">
+
+            <sysproperty key="hy.cfg" value="${drlvm.config}" />
+            <sysproperty key="common.resources.loc"
+                         value="${drlvm-test.parameters.svn.common_resources.location}" />
+        </exec-ant>
+
         <!-- launch the tests kernel.test -->
-        <exec-ant dir="${built.drlvm.trunk}"
+        <exec-ant dir="${drlvm-test.parameters.svn.drlvm.location}"
                   targets="test"
                   failonerror="false"
                   failproperty="drlvm-test.run.failed">
+
             <sysproperty key="hy.cfg" value="${drlvm.config}" />
             <sysproperty key="common.resources.loc"
-                         value="${common.resources}" />
+                         value="${drlvm-test.parameters.svn.common_resources.location}" />
             <sysproperty key="test.mode"
                          value="${drlvm-test.parameters.optional.test.mode}" />
             <sysproperty key="run.all.tests" value="true" />
-            <arg line="${tested.hdk.param}" />
+            <sysproperty key="test.hdk.home"
+                         value="${drlvm-test.parameters.required.hy.hdk}" />
         </exec-ant>
 
+        <!-- define the resulting files -->
+        <fileset id="drlvm-test.results.set"
+                 dir="${drlvm-test.parameters.svn.drlvm.location}/build"
+                 includes="*${drlvm.config}/**/TEST-*.xml">
+            <date datetime="${drlvm-test.run.time}"
+                  pattern="yyyyMMdd_HHmm"
+                  when="after" />
+        </fileset>
+
+        <copy todir="${drlvm-test.results.dir}">
+            <fileset refid="drlvm-test.results.set" />
+            <packagemapper from="*" to="*" />
+        </copy>
+
         <fail message="There were drlvm-test failures"
               if="drlvm-test.run.failed" />
     </target>
@@ -60,32 +90,20 @@
                 trim="yes" />
     </condition>
 
-    <condition property="tested.hdk.param"
-               value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}"
-               else="">
-        <isset property="is.snapshot" />
-    </condition>
-
     <target name="-update"
             if="is.snapshot"
             description="adjusts tests to snapshot revision">
-        <mkdir dir="${built.drlvm.trunk}" />
-        <mkdir dir="${common.resources}" />
-        <loadproperties srcFile="${snapshot.svn.revision.file}" />
-        <exec executable="svn" dir="${common.resources}" failonerror="true">
-            <arg line="co -r${svn.revision} ${common.resources.url} ." />
+
+        <exec executable="svn"
+              dir="${drlvm-test.parameters.svn.common_resources.location}"
+              failonerror="true">
+            <arg line="up -r${svn.revision} ." />
         </exec>
-        <exec executable="svn" dir="${built.drlvm.trunk}" failonerror="true">
-            <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
+        <exec executable="svn"
+              dir="${drlvm-test.parameters.svn.drlvm.location}"
+              failonerror="true">
+            <arg line="up -r${svn.revision} ." />
         </exec>
-
-        <exec-ant dir="${built.drlvm.trunk}"
-                  targets="clean fetch-depends"
-                  failonerror="true">
-            <sysproperty key="hy.cfg" value="${drlvm.config}" />
-            <sysproperty key="common.resources.loc"
-                         value="${common.resources}" />
-        </exec-ant>
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/parameters.xml?rev=652238&r1=652237&r2=652238&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/parameters.xml Tue Apr 29 20:20:55
2008
@@ -19,17 +19,18 @@
 <parameters depends="classlib,drlvm">
 
     <required>
-        <built.drlvm.trunk 
-            description="Path to built drlvm trunk"
-            value="${drlvm.parameters.shared.trunk.dir}" />
-        <common.resources description="Path to shared pool" 
-            value="${built.drlvm.trunk}/../common_resources"
-            url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources/trunk"/>
+        <hy.hdk description="Harmony HDK root dir" 
+            value="${drlvm.parameters.svn.drlvm.location}/deploy" />
         <drlvm.config
             description="The built drlvm configuration (debug/release)"
             value="${drlvm.parameters.shared.build.config}"/>
     </required>
 
+    <svn>
+      <drlvm url="http://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk" />
+      <common_resources url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources/trunk"/>
+    </svn>
+
     <optional>
         <test.mode 
             description="DRLVM Test Execution Modes"

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=652238&r1=652237&r2=652238&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/adaptor.xml Tue Apr 29 20:20:55
2008
@@ -18,29 +18,36 @@
 <project name="jdktools-test" default="run" basedir=".">
 
     <property name="tests.results.dir"
-              value="${built.trunk.dir}/build/test_report" />
+              value="${jdktools-test.parameters.svn.jdktools.location}/build/test_report"
/>
 
     <target name="setup" />
 
-    <target name="run" depends="-setup-jdktools-ws,-update-jdktools-ws">
+    <target name="run" depends="-update-jdktools-ws">
 
         <!-- Do clean first (even before rebuild) -->
         <!-- to remove previous results           -->
-        <exec-ant targets="clean-tests" dir="${built.trunk.dir}">
+        <exec-ant targets="clean-tests"
+                  dir="${jdktools-test.parameters.svn.jdktools.location}">
             <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="clean fetch-depends"
+                  dir="${jdktools-test.parameters.svn.jdktools.location}">
+            <sysproperty key="hy.hdk"
+                         value="${jdktools-test.parameters.required.hy.hdk}" />
+        </exec-ant>
 
-        <exec-ant targets="rebuild" dir="${built.trunk.dir}">
+        <exec-ant targets="build"
+                  dir="${jdktools-test.parameters.svn.jdktools.location}">
             <sysproperty key="hy.hdk"
                          value="${jdktools-test.parameters.required.hy.hdk}" />
+            <sysproperty key="common.resources.loc"
+                         value="${jdktools-test.parameters.svn.common_resources.location}"
/>
         </exec-ant>
 
-        <exec-ant targets="test" dir="${built.trunk.dir}">
+        <exec-ant targets="test"
+                  dir="${jdktools-test.parameters.svn.jdktools.location}">
             <sysproperty key="hy.hdk"
                          value="${jdktools-test.parameters.required.hy.hdk}" />
             <sysproperty key="exclude.interm" value="true" />
@@ -58,34 +65,19 @@
                 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}" />
-    </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="${jdktools-test.parameters.required.hdk.trunk.dir}"
+              dir="${jdktools-test.parameters.svn.jdktools.location}"
+              failonerror="true">
+            <arg line="up -r${svn.revision} ." />
+        </exec>
+        <exec executable="svn"
+              dir="${jdktools-test.parameters.svn.common_resources.location}"
               failonerror="true">
-            <arg line="-r${svn.revision}" />
-            <arg line="update" />
-            <!-- update only build.xml. ws update is done during rebuild -->
-            <arg line="build.xml" />
+            <arg line="up -r${svn.revision} ." />
         </exec>
 
     </target>

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=652238&r1=652237&r2=652238&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/jdktools-test/parameters.xml Tue Apr 29
20:20:55 2008
@@ -26,9 +26,6 @@
         <tested.jre description="Path to JRE under test" 
             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="${checkouts.dir}/jdktools" />
     </required>
     
     <optional>
@@ -38,6 +35,7 @@
 
     <svn>
       <jdktools url="http://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk"
/>
+      <common_resources url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources/trunk"/>
     </svn>
 
     <cc results="${tests.results.dir}' pattern='TEST-*.xml"/>

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties?rev=652238&r1=652237&r2=652238&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties Tue
Apr 29 20:20:55 2008
@@ -25,17 +25,13 @@
 #
 drlvm-reg-test.parameters.depends=snapshot
 drlvm-reg-test.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
-drlvm-reg-test.parameters.required.built.drlvm.trunk=${checkouts.dir}/hdk/working_vm
-drlvm-reg-test.parameters.required.built.classlib.trunk=${checkouts.dir}/hdk/working_classlib
-drlvm-reg-test.parameters.required.drlvm.trunk.url=http://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk
 drlvm-reg-test.parameters.required.drlvm.config=release
+drlvm-reg-test.parameters.required.hy.hdk=${snapshot.parameters.shared.hdk}
 
 #
 drlvm-test.parameters.depends=snapshot
 drlvm-test.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
-drlvm-test.parameters.required.built.drlvm.trunk=${checkouts.dir}/hdk/working_vm
-drlvm-test.parameters.required.built.classlib.trunk=${checkouts.dir}/hdk/working_classlib
-drlvm-test.parameters.required.drlvm.trunk.url=http://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk
+drlvm-test.parameters.required.hy.hdk=${snapshot.parameters.shared.hdk}
 drlvm-test.parameters.required.drlvm.config=release
 
 #
@@ -94,11 +90,7 @@
 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=http://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=http://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk
+jdktools-test.parameters.required.hy.hdk=${snapshot.parameters.shared.hdk}
 
 #
 jedit_test.parameters.depends=snapshot



Mime
View raw message