Return-Path: 
 <commits-return-52921-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 12984 invoked from network); 7 Apr 2008 08:36:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Apr 2008 08:36:44 -0000
Received: (qmail 25632 invoked by uid 500); 7 Apr 2008 08:36:44 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 25610 invoked by uid 500); 7 Apr 2008 08:36:44 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 25601 invoked by uid 99); 7 Apr 2008 08:36:44 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2008 01:36:44 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2008 08:36:10 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4AB7D1A9832; Mon,  7 Apr 2008 01:36:22 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r645411 - in
 /harmony/enhanced/buildtest/trunk/infra/scripts:
 run.xml setup.xml
Date: Mon, 07 Apr 2008 08:36:21 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080407083622.4AB7D1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>