harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1029668 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/auth/make/ classlib/modu...
Date Mon, 01 Nov 2010 14:06:06 GMT
Author: hindessm
Date: Mon Nov  1 14:06:05 2010
New Revision: 1029668

URL: http://svn.apache.org/viewvc?rev=1029668&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1029636:

  r1029636 | hindessm | 2010-11-01 13:07:48 +0000 (Mon, 01 Nov 2010) | 1 line
  
  Refactor test properties.

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

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  1 14:06:05 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390,1027403,1027413,1027985,1028681,1029073,1029103,1029131,1029194
+/harmony/enhanced/java/trunk:929253-1029636
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  1 14:06:05 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390,1027403,1027413,1027985,1028681,1029073,1029103,1029131,1029194
+/harmony/enhanced/java/trunk/classlib:929253-1029636
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  1 14:06:05 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390,1027403,1027413,1027985,1028681,1029073,1029103,1029131,1029194
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/annotation/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/applet/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/archive/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/auth/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/awt/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/beans/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/beans/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/beans/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/beans/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/concurrent/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/concurrent/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/concurrent/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/concurrent/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/crypto/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/imageio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/instrument/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/instrument/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/instrument/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/instrument/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/jndi/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/jndi/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/jndi/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/jndi/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/lang-management/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/logging/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/logging/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/logging/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/logging/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/luni/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/math/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/math/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/math/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/math/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/misc/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/misc/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/misc/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/misc/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/nio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/nio_char/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio_char/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio_char/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio_char/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/pack200/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/prefs/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/print/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/print/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/print/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/print/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/regex/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/regex/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/regex/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/regex/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/rmi/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/rmi/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/rmi/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/rmi/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/security/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/sound/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sound/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/sound/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/sound/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/sql/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sql/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/sql/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/sql/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/suncompat/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/suncompat/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/suncompat/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/suncompat/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/swing/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/swing/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/swing/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/swing/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/text/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/text/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/text/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/text/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/classlib/modules/x-net/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml Mon Nov  1 14:06:05 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" />
 

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  1 14:06:05 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390,1027403,1027413,1027985,1028681,1029073,1029103,1029131,1029194
+/harmony/enhanced/java/trunk/drlvm:929253-1029636
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  1 14:06:05 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390,1027403,1027413,1027985,1028681,1029073,1029103,1029131,1029194
+/harmony/enhanced/java/trunk/jdktools:929253-1029636
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/jdktools/modules/jpda/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/jdktools/modules/jretools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml Mon Nov  1 14:06:05 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/branches/java6/jdktools/modules/samsa/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml?rev=1029668&r1=1029667&r2=1029668&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml Mon Nov  1 14:06:05 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