harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r656936 - in /harmony/enhanced/buildtest/trunk/infra/adaptors: ehwa-api/adaptor.xml ehwa-api/parameters.xml snapshot/framework.local.properties
Date Fri, 16 May 2008 05:26:55 GMT
Author: smishura
Date: Thu May 15 22:26:54 2008
New Revision: 656936

URL: http://svn.apache.org/viewvc?rev=656936&view=rev
Log:
Update ehwa-api:
- checkout only necessary artifacts from DRLVM workspace (build files + plugin)
- update workspace is case of snapshot testing

Modified:
    harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/parameters.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/adaptor.xml?rev=656936&r1=656935&r2=656936&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/adaptor.xml Thu May 15 22:26:54
2008
@@ -81,20 +81,33 @@
     </target>
 
     <!-- Run of the EHWA scenario -->
-    <target name="run">
+    <target name="run" depends="-update">
         <log message="============= Adaptor for ${suite.name}: Run ..." />
 
-        <exec-ant dir="${built.drlvm.trunk}"
-                  targets="ehwa.test"
-                  failonerror="true"
-                  failproperty="drlvm-ehwa-test.run.failed">
-            <sysproperty key="hy.cfg" value="${drlvm.config}" />
+        <exec-ant dir="${ehwa-api.parameters.svn.ehwa-api.location}/tests"
+                  file="ehwa-test.xml"
+                  targets="fetch-depends"
+                  failonerror="true">
+
+            <sysproperty key="common.resources.loc"
+                         value="${ehwa-api.parameters.svn.common_resources.location}" />
+        </exec-ant>
+
+        <exec-ant dir="${ehwa-api.parameters.svn.ehwa-api.location}/tests"
+                  file="ehwa-test.xml"
+                  targets="ehwa">
+
             <sysproperty key="eclipse.home"
                          value="${eclipse-3.2.1.homedir}/eclipse" />
             <sysproperty key="test.mode"
                          value="${ehwa-api.parameters.optional.test.mode}" />
             <sysproperty key="test.jre.home"
                          value="${ehwa-api.parameters.required.tested.runtime}" />
+            <sysproperty key="common.resources.loc"
+                         value="${ehwa-api.parameters.svn.common_resources.location}" />
+
+            <!-- then the path to plugin zip is ${checkouts.dir}/ehwa/ehwa.zip -->
+            <sysproperty key="test.home" value="${checkouts.dir}" />
         </exec-ant>
     </target>
 
@@ -133,5 +146,30 @@
              verbose="true" />
     </target>
 
+    <!--                                                    -->
+    <!-- Targets and properties related to snapshot testing -->
+    <!--                                                    -->
+    <condition property="is.snapshot">
+        <equals arg1="${ehwa-api.parameters.depends}"
+                arg2="snapshot"
+                trim="yes" />
+    </condition>
+
+    <target name="-update"
+            if="is.snapshot"
+            description="adjusts tests to snapshot revision">
+
+        <exec executable="svn"
+              dir="${ehwa-api.parameters.svn.common_resources.location}"
+              failonerror="true">
+            <arg line="up -r${svn.revision} ." />
+        </exec>
+        <exec executable="svn"
+              dir="${ehwa-api.parameters.svn.ehwa-api.location}"
+              failonerror="true">
+            <arg line="up -r${svn.revision} ." />
+        </exec>
+    </target>
+
 </project>
 

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/parameters.xml?rev=656936&r1=656935&r2=656936&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/ehwa-api/parameters.xml Thu May 15 22:26:54
2008
@@ -19,16 +19,21 @@
 <parameters depends="drlvm">
     
     <required>
-        <built.drlvm.trunk 
-            description="Path to built drlvm trunk"
-            value="${drlvm.parameters.shared.trunk.dir}" />
-        <drlvm.config
-            description="The built drlvm configuration (debug/release)"
-            value="${drlvm.parameters.shared.build.config}"/>
         <tested.runtime
             description="Path to Tested Runtime"
             value="${drlvm.parameters.shared.jre.dir}"/>
     </required>
+
+    <svn>
+      <!-- take only build files from DRLVM -->
+      <ehwa-api url="http://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk/make"
/>
+
+      <!-- take plugin -->
+      <ehwa url="http://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk/vm/tests/ehwa"
/>
+ 
+      <!-- DRLVM build requires it but do we really need it for the scenario? -->
+      <common_resources url="http://svn.apache.org/repos/asf/harmony/enhanced/common_resources/trunk"
/>
+    </svn>
     
     <optional>
         <test.mode 

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=656936&r1=656935&r2=656936&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/snapshot/framework.local.properties Thu
May 15 22:26:54 2008
@@ -54,7 +54,6 @@
 ehwa-api.parameters.depends=snapshot
 ehwa-api.parameters.required.tested.runtime=${snapshot.parameters.shared.jre}
 ehwa-api.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
-ehwa-api.parameters.required.drlvm.config=release
 
 #
 func.parameters.depends=snapshot



Mime
View raw message