harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r574217 - in /harmony/enhanced/buildtest/branches/2.0/adaptors: drlvm-reg-test/adaptor.xml drlvm-test/adaptor.xml snapshot/adaptor.xml snapshot/framework.local.properties snapshot/parameters.xml
Date Mon, 10 Sep 2007 12:15:09 GMT
Author: varlax
Date: Mon Sep 10 05:15:08 2007
New Revision: 574217

URL: http://svn.apache.org/viewvc?rev=574217&view=rev
Log:
Support of snapshot testing of drlvm tests

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/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/parameters.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml?rev=574217&r1=574216&r2=574217&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-reg-test/adaptor.xml Mon Sep 10
05:15:08 2007
@@ -26,7 +26,7 @@
         <mkdir dir="${results.dir}/${suite.name}"/>
     </target>
     
-    <target name="run">
+    <target name="run" depends="-update">
         <!-- remove old results (they should be archived after the run) -->
         <delete quiet="true" verbose="false">
             <fileset dir="${drlvm-reg-test.results.dir}" includes="**/*"/>
@@ -37,7 +37,7 @@
             <format property="drlvm-reg-test.run.time" pattern="yyyyMMdd_HHmm"/>
         </tstamp>
 
-        <!-- launch the tests kernel.test -->
+        <!-- launch the tests -->
         <exec-ant dir="${built.drlvm.trunk}/build"
                   file="make/build.xml"
                   targets="reg.test"
@@ -49,6 +49,7 @@
                          value='${built.classlib.trunk}'/>
             <sysproperty key="machine.arch" value="${os.arch}"/>
             <sysproperty key="junit.jar" value="${ext.junit.location}"/>
+            <arg line="${tested.hdk.param}"/>
         </exec-ant>
 
         <!-- define the resulting files -->
@@ -72,5 +73,54 @@
         <fail message="There were drlvm-reg-test failures" 
               if="drlvm-reg-test.run.failed"/>
     </target>
+    
+    
+    <!--                                                    -->
+    <!-- Targets and properties related to snapshot testing -->
+    <!--                                                    -->
+    <condition property="is.snapshot">
+        <equals arg1="${drlvm-reg-test.parameters.depends}"
+                arg2="snapshot"
+                trim="yes" />
+    </condition>
+    
+    <condition property="tested.hdk.param" value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}">
+        <isset property="is.snapshot"/>
+    </condition>
+
+    <target name="-update" if="is.snapshot" 
+        description="adjusts tests to snapshot revision">
+        <mkdir dir="${built.drlvm.trunk}" />
+        <loadproperties srcFile="${snapshot.svn.revision.file}" />
+        <exec executable="svn"
+              dir="${built.drlvm.trunk}"
+              failonerror="true">
+            <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
+        </exec>
+
+        <exec-ant dir="${built.drlvm.trunk}/build"
+                  file="make/build.xml"
+                  targets="clean"
+                  lib="${built.drlvm.trunk}/build/make/tmp"
+                  failonerror="true">
+            <sysproperty key="build.cfg" value="${drlvm.config}"/>
+            <sysproperty key="external.dep.CLASSLIB.loc"
+                         value='${built.classlib.trunk}'/>
+            <sysproperty key="machine.arch" value="${os.arch}"/>
+        </exec-ant>
+
+        <exec-ant dir="${built.drlvm.trunk}/build"
+                  file="make/build.xml"
+                  targets="update"
+                  lib="${built.drlvm.trunk}/build/make/tmp"
+                  failonerror="true">
+            <sysproperty key="build.cfg" value="${drlvm.config}"/>
+            <sysproperty key="external.dep.CLASSLIB.loc"
+                         value='${built.classlib.trunk}'/>
+            <sysproperty key="machine.arch" value="${os.arch}"/>
+        </exec-ant>
+                    
+    </target>
+
 </project>
 

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml?rev=574217&r1=574216&r2=574217&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm-test/adaptor.xml Mon Sep 10 05:15:08
2007
@@ -26,7 +26,7 @@
         <mkdir dir="${results.dir}/${suite.name}"/>
     </target>
     
-    <target name="run">
+    <target name="run" depends="-update">
         <!-- remove old results (they should be archived after the run) -->
         <delete quiet="true" verbose="false">
             <fileset dir="${drlvm-test.results.dir}" includes="**/*"/>
@@ -51,6 +51,7 @@
             <sysproperty key="test.mode" 
                          value="${drlvm-test.parameters.optional.test.mode}"/>
             <sysproperty key="run.all.tests" value="true" />
+            <arg line="${tested.hdk.param}"/>
         </exec-ant>
 
         <!-- define the resulting files -->
@@ -74,5 +75,53 @@
         <fail message="There were drlvm-test failures" 
               if="drlvm-test.run.failed"/>
     </target>
+    
+    <!--                                                    -->
+    <!-- Targets and properties related to snapshot testing -->
+    <!--                                                    -->
+    <condition property="is.snapshot">
+        <equals arg1="${drlvm-test.parameters.depends}"
+                arg2="snapshot"
+                trim="yes" />
+    </condition>
+    
+    <condition property="tested.hdk.param" value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}">
+        <isset property="is.snapshot"/>
+    </condition>
+
+    <target name="-update" if="is.snapshot" 
+        description="adjusts tests to snapshot revision">
+        <mkdir dir="${built.drlvm.trunk}" />
+        <loadproperties srcFile="${snapshot.svn.revision.file}" />
+        <exec executable="svn"
+              dir="${built.drlvm.trunk}"
+              failonerror="true">
+            <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
+        </exec>
+
+        <exec-ant dir="${built.drlvm.trunk}/build"
+                  file="make/build.xml"
+                  targets="clean"
+                  lib="${built.drlvm.trunk}/build/make/tmp"
+                  failonerror="true">
+            <sysproperty key="build.cfg" value="${drlvm.config}"/>
+            <sysproperty key="external.dep.CLASSLIB.loc"
+                         value='${built.classlib.trunk}'/>
+            <sysproperty key="machine.arch" value="${os.arch}"/>
+        </exec-ant>
+
+        <exec-ant dir="${built.drlvm.trunk}/build"
+                  file="make/build.xml"
+                  targets="update"
+                  lib="${built.drlvm.trunk}/build/make/tmp"
+                  failonerror="true">
+            <sysproperty key="build.cfg" value="${drlvm.config}"/>
+            <sysproperty key="external.dep.CLASSLIB.loc"
+                         value='${built.classlib.trunk}'/>
+            <sysproperty key="machine.arch" value="${os.arch}"/>
+        </exec-ant>
+                    
+    </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?rev=574217&r1=574216&r2=574217&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Mon Sep 10 05:15:08
2007
@@ -200,6 +200,24 @@
         <archive-result/>
     </target>
 
+    <target name="publish-drlvm-reg-test">
+        <mkdir dir="${snapshot.results.dir}/drlvm-reg-test" />
+        <junitreport todir="${results.dir}/drlvm-reg-test">
+            <fileset dir="${results.dir}/drlvm-reg-test" includes="*TEST-*.xml" />
+            <report format="frames" todir="${snapshot.results.dir}/drlvm-reg-test" />
+        </junitreport>
+        <archive-result/>
+    </target>
+
+    <target name="publish-drlvm-test">
+        <mkdir dir="${snapshot.results.dir}/drlvm-test" />
+        <junitreport todir="${results.dir}/drlvm-test">
+            <fileset dir="${results.dir}/drlvm-test" includes="*TEST-*.xml" />
+            <report format="frames" todir="${snapshot.results.dir}/drlvm-test" />
+        </junitreport>
+        <archive-result/>
+    </target>
+
     <target name="publish-func">
         <delete dir="${snapshot.results.dir}/func" />
         <mkdir dir="${snapshot.results.dir}/func" />

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?rev=574217&r1=574216&r2=574217&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties Mon
Sep 10 05:15:08 2007
@@ -23,6 +23,22 @@
 dacapo.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
 
 #
+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=https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk
+drlvm-reg-test.parameters.required.drlvm.config=release
+
+#
+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=https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk
+drlvm-test.parameters.required.drlvm.config=release
+
+#
 eut.parameters.depends=snapshot
 eut.parameters.required.tested.runtime=${snapshot.parameters.shared.jre}
 eut.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml

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=574217&r1=574216&r2=574217&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml Mon Sep 10 05:15:08
2007
@@ -5,6 +5,7 @@
         <arch.dir value="${cc.log.dir}"/>
         <jre value="${checkouts.dir}/snapshot/hdk/jdk/jre"/>
         <jdk value="${checkouts.dir}/snapshot/hdk/jdk"/>
+        <hdk value="${checkouts.dir}/snapshot/hdk"/>
         <jvm.location value="${checkouts.dir}/snapshot/hdk/jdk/jre/bin/java${exe}"/>
         <svn.revision.file location="${checkouts.dir}/snapshot/svn.revision"/>
     </shared>



Mime
View raw message