harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r645411 - in /harmony/enhanced/buildtest/trunk/infra/scripts: run.xml setup.xml
Date Mon, 07 Apr 2008 08:36:21 GMT
Author: smishura
Date: Mon Apr  7 01:36:21 2008
New Revision: 645411

URL: http://svn.apache.org/viewvc?rev=645411&view=rev
Log:
Load additionally framework.properties.file before setup & run

Modified:
    harmony/enhanced/buildtest/trunk/infra/scripts/run.xml
    harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/run.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/run.xml?rev=645411&r1=645410&r2=645411&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/run.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/run.xml Mon Apr  7 01:36:21 2008
@@ -41,10 +41,6 @@
                   failproperty="suite.failed">
             <sysproperty key="suite.name" value="${suite.name}" />
             <sysproperty key="config.dir" value="${config.dir}" />
-            
-            <!-- for defining ant-contrib's tasks -->
-            <sysproperty key="external.resources.location"
-                         value="${external.resources.location}" />
         </exec-ant>
 
         <!-- store suite's execution status -->
@@ -103,13 +99,11 @@
         </subant>
     </target>
 
-    <target name="run" depends="define-ant-contrib">
+    <target name="run" depends="-init-run,define-ant-contrib">
         <!-- FIXME: several suites depends on ant-contrib
              but they don't explicitly add its tasks definitions
         -->
 
-        <property file="${config.dir}/${suite.name}.properties" />
-
         <ant dir="${adaptors.dir}/${suite.name}"
              antfile="adaptor.xml"
              target="run"
@@ -117,5 +111,10 @@
             <property name="suite.adaptor.dir"
                       location="${adaptors.dir}/${suite.name}" />
         </ant>
+    </target>
+
+    <target name="-init-run">
+        <property file="${config.dir}/${suite.name}.properties" />
+        <property file="${framework.properties.file}" />
     </target>
 </project>

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml?rev=645411&r1=645410&r2=645411&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml Mon Apr  7 01:36:21 2008
@@ -39,10 +39,6 @@
                   failproperty="suite.failed">
             <sysproperty key="suite.name" value="${suite.name}" />
             <sysproperty key="config.dir" value="${config.dir}" />
-            
-            <!-- for defining ant-contrib's tasks -->
-            <sysproperty key="external.resources.location"
-                         value="${external.resources.location}" />
         </exec-ant>
 
         <!-- store suite's execution status -->
@@ -100,13 +96,11 @@
         </subant>
     </target>
 
-    <target name="setup" depends="define-ant-contrib">
+    <target name="setup" depends="-init-setup, define-ant-contrib">
         <!-- FIXME: several suites depends on ant-contrib
              but they don't explicitly add its tasks definitions
         -->
 
-        <property file="${config.dir}/${suite.name}.properties" />
-
         <ant dir="${adaptors.dir}/${suite.name}"
              antfile="adaptor.xml"
              target="setup"
@@ -114,5 +108,10 @@
             <property name="suite.adaptor.dir"
                       location="${adaptors.dir}/${suite.name}" />
         </ant>
+    </target>
+
+    <target name="-init-setup">
+        <property file="${config.dir}/${suite.name}.properties" />
+        <property file="${framework.properties.file}" />
     </target>
 </project>



Mime
View raw message