harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1029636 - in /harmony/enhanced/java/trunk: classlib/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/auth/make/ classlib/modules/awt/make/ classlib/modules/beans/make/ cl...
Date Mon, 01 Nov 2010 13:07:49 GMT
Author: hindessm
Date: Mon Nov  1 13:07:48 2010
New Revision: 1029636

URL: http://svn.apache.org/viewvc?rev=1029636&view=rev
Log:
Refactor test properties.

Added:
    harmony/enhanced/java/trunk/common_resources/make/testproperties.xml   (with props)
Modified:
    harmony/enhanced/java/trunk/classlib/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/annotation/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/applet/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/archive/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/auth/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/awt/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/concurrent/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/instrument/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/jndi/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/logging/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/math/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/misc/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/nio/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/nio_char/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/pack200/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/prefs/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/print/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/regex/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/rmi/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/sound/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/sql/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/suncompat/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/swing/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/text/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml
    harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml
    harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml
    harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml

Modified: harmony/enhanced/java/trunk/classlib/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="test.properties" />
-
-    <!-- These two parameters could be assigned by user -->
-    <property name="hy.test.root" value="." />
+    <property name="hy.test.root" location="." />
     <property name="hy.component" value="test" />
     <property name="hy.module" value="toplevel" />
-    <property name="work.dir" value="${test.root}" />
-    <property name="tests.output" value="${work.dir}/report" />
-    <property name="report.dir" value="${tests.output}/html" />
-    <property name="junit.jar" value="${test.root}/junit.jar" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <property name="gen.report" value="true" />
     <condition property="do.full.report" value="true">
@@ -45,10 +37,7 @@
         </and>
     </condition>
 
-    <import file="../ant/properties.xml" />
-
-    <target name="test"
-            depends="test-jre-vm-info,-test,check-test-result" />
+    <target name="test" depends="test-jre-vm-info,-test,check-test-result" />
 
     <target name="clean">
         <delete dir="${tests.output}" />

Modified: harmony/enhanced/java/trunk/classlib/modules/annotation/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/annotation/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/annotation/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/annotation/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Annotation Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="annotation" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/applet/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/applet/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/applet/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/applet/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Applet Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="applet" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/archive/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Archive Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="archive" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/auth/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/auth/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/auth/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/auth/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Auth Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="auth" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony AWT Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="awt" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Beans Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="beans" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/concurrent/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/concurrent/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/concurrent/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/concurrent/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Concurrent Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="concurrent" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Crypto Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="crypto" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Imageio Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="imageio" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/instrument/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Instrument Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="instrument" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/jndi/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/jndi/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/jndi/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/jndi/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony JNDI Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="jndi" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Lang-Management Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="lang-management" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/logging/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/logging/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/logging/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/logging/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Logging Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="logging" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony LUNI Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="luni" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/math/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/math/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/math/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/math/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Math Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="math" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/misc/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/misc/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/misc/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/misc/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Misc Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="misc" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/nio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Nio Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="nio" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/nio_char/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio_char/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio_char/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio_char/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony NIO Char Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="nio_char" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Pack200 Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="pack200" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/prefs/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/prefs/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/prefs/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/prefs/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Prefs Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="prefs" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/print/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/print/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/print/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/print/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Print Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="print" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/regex/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/regex/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/regex/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/regex/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Regex Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="regex" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/rmi/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/rmi/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/rmi/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/rmi/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Rmi Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="rmi" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Security Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="security" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/sound/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/sound/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/sound/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/sound/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Sound Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="sound" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/sql/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/sql/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/sql/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/sql/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony SQL Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="sql" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/suncompat/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/suncompat/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/suncompat/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/suncompat/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Suncompat Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="suncompat" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/swing/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/swing/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/swing/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/swing/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Swing Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="swing" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/text/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/text/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/text/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/text/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony Text Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="text" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony X-Net Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="x-net" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Added: harmony/enhanced/java/trunk/common_resources/make/testproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/testproperties.xml?rev=1029636&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/testproperties.xml (added)
+++ harmony/enhanced/java/trunk/common_resources/make/testproperties.xml Mon Nov  1 13:07:48 2010
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied.  See the License for the specific language governing
+  permissions and limitations under the License.
+
+ -->
+
+<project name="Common test property definitions">
+    <description>
+        Ant file of common test properties to be imported by other ant
+        test files
+    </description>
+
+    <property name="hy.target" value="${hy.test.root}" />
+    <property name="hy.hdk" location="${hy.test.root}/../.." />
+    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
+    <property name="work.dir" value="${hy.test.root}" />
+    <property name="tests.output" value="${work.dir}/report" />
+    <property name="report.dir" value="${tests.output}/html" />
+    <property name="junit.jar" value="${hy.test.root}/junit.jar" />
+    <property file="${hy.test.root}/test.properties" />
+
+    <import file="${hy.test.root}/../ant/properties.xml" />
+</project>

Propchange: harmony/enhanced/java/trunk/common_resources/make/testproperties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony JDK tools Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jdktools" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony JDK tools Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jpda" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony JRE tools Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jretools" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml?rev=1029636&r1=1029635&r2=1029636&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml Mon Nov  1 13:07:48 2010
@@ -18,18 +18,10 @@
 
 <project name="Harmony SAMSA Test" default="test" basedir=".">
 
-    <property name="hy.hdk" location="../../.." />
-    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
-    <property file="../test.properties" />
-
-    <property name="work.dir" value=".." />
-    <property name="hy.test.root" value=".." />
+    <property name="hy.test.root" location=".." />
     <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="samsa" />
-    <property name="tests.output" location="../report" />
-    <property name="junit.jar" location="../junit.jar" />
-
-    <import file="../../ant/properties.xml" />
+    <import file="${hy.test.root}/../ant/testproperties.xml" />
 
     <target name="test" depends="test-module" />
 



Mime
View raw message