Refactor test properties.
git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk@1029636 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/classlib/make/run-test.xml b/classlib/make/run-test.xml
index ba0eaf4..0bd2632 100644
--- a/classlib/make/run-test.xml
+++ b/classlib/make/run-test.xml
@@ -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}" />
diff --git a/classlib/modules/annotation/make/run-test.xml b/classlib/modules/annotation/make/run-test.xml
index 6d0aaf0..477043d 100644
--- a/classlib/modules/annotation/make/run-test.xml
+++ b/classlib/modules/annotation/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/applet/make/run-test.xml b/classlib/modules/applet/make/run-test.xml
index c870497..255942d 100644
--- a/classlib/modules/applet/make/run-test.xml
+++ b/classlib/modules/applet/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/archive/make/run-test.xml b/classlib/modules/archive/make/run-test.xml
index 74ee469..5f0654e 100644
--- a/classlib/modules/archive/make/run-test.xml
+++ b/classlib/modules/archive/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/auth/make/run-test.xml b/classlib/modules/auth/make/run-test.xml
index 48254f8..b6280cf 100644
--- a/classlib/modules/auth/make/run-test.xml
+++ b/classlib/modules/auth/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/awt/make/run-test.xml b/classlib/modules/awt/make/run-test.xml
index 8c9f211..fb185eb 100644
--- a/classlib/modules/awt/make/run-test.xml
+++ b/classlib/modules/awt/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/beans/make/run-test.xml b/classlib/modules/beans/make/run-test.xml
index 4a02f86..1406eb8 100644
--- a/classlib/modules/beans/make/run-test.xml
+++ b/classlib/modules/beans/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/concurrent/make/run-test.xml b/classlib/modules/concurrent/make/run-test.xml
index dc457bd..2a758fd 100644
--- a/classlib/modules/concurrent/make/run-test.xml
+++ b/classlib/modules/concurrent/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/crypto/make/run-test.xml b/classlib/modules/crypto/make/run-test.xml
index d7b81df..c773928 100644
--- a/classlib/modules/crypto/make/run-test.xml
+++ b/classlib/modules/crypto/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/imageio/make/run-test.xml b/classlib/modules/imageio/make/run-test.xml
index 5dd56cc..8f9e433 100644
--- a/classlib/modules/imageio/make/run-test.xml
+++ b/classlib/modules/imageio/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/instrument/make/run-test.xml b/classlib/modules/instrument/make/run-test.xml
index 54b6b9a..c5f19a3 100644
--- a/classlib/modules/instrument/make/run-test.xml
+++ b/classlib/modules/instrument/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/jndi/make/run-test.xml b/classlib/modules/jndi/make/run-test.xml
index 318974f..bcf3f96 100644
--- a/classlib/modules/jndi/make/run-test.xml
+++ b/classlib/modules/jndi/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/lang-management/make/run-test.xml b/classlib/modules/lang-management/make/run-test.xml
index d545c87..4aa143a 100644
--- a/classlib/modules/lang-management/make/run-test.xml
+++ b/classlib/modules/lang-management/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/logging/make/run-test.xml b/classlib/modules/logging/make/run-test.xml
index cbf93c0..a69baa3 100644
--- a/classlib/modules/logging/make/run-test.xml
+++ b/classlib/modules/logging/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/luni/make/run-test.xml b/classlib/modules/luni/make/run-test.xml
index fd3d3a1..b0ebb26 100644
--- a/classlib/modules/luni/make/run-test.xml
+++ b/classlib/modules/luni/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/math/make/run-test.xml b/classlib/modules/math/make/run-test.xml
index 1b345a6..c791f22 100644
--- a/classlib/modules/math/make/run-test.xml
+++ b/classlib/modules/math/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/misc/make/run-test.xml b/classlib/modules/misc/make/run-test.xml
index 3307537..d58b645 100644
--- a/classlib/modules/misc/make/run-test.xml
+++ b/classlib/modules/misc/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/nio/make/run-test.xml b/classlib/modules/nio/make/run-test.xml
index 1f85e6a..86ca01b 100644
--- a/classlib/modules/nio/make/run-test.xml
+++ b/classlib/modules/nio/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/nio_char/make/run-test.xml b/classlib/modules/nio_char/make/run-test.xml
index 9606668..07e7712 100644
--- a/classlib/modules/nio_char/make/run-test.xml
+++ b/classlib/modules/nio_char/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/pack200/make/run-test.xml b/classlib/modules/pack200/make/run-test.xml
index f79be31..a527b79 100644
--- a/classlib/modules/pack200/make/run-test.xml
+++ b/classlib/modules/pack200/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/prefs/make/run-test.xml b/classlib/modules/prefs/make/run-test.xml
index 6eeaa88f..acb3459 100644
--- a/classlib/modules/prefs/make/run-test.xml
+++ b/classlib/modules/prefs/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/print/make/run-test.xml b/classlib/modules/print/make/run-test.xml
index 40b195c..a2e0cb4 100644
--- a/classlib/modules/print/make/run-test.xml
+++ b/classlib/modules/print/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/regex/make/run-test.xml b/classlib/modules/regex/make/run-test.xml
index 7e8adcf..340984a 100644
--- a/classlib/modules/regex/make/run-test.xml
+++ b/classlib/modules/regex/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/rmi/make/run-test.xml b/classlib/modules/rmi/make/run-test.xml
index 2f36508..3a48db9 100644
--- a/classlib/modules/rmi/make/run-test.xml
+++ b/classlib/modules/rmi/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/security/make/run-test.xml b/classlib/modules/security/make/run-test.xml
index d241f55..47cb635 100644
--- a/classlib/modules/security/make/run-test.xml
+++ b/classlib/modules/security/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/sound/make/run-test.xml b/classlib/modules/sound/make/run-test.xml
index 52fca41..3683a5a 100644
--- a/classlib/modules/sound/make/run-test.xml
+++ b/classlib/modules/sound/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/sql/make/run-test.xml b/classlib/modules/sql/make/run-test.xml
index a32b154..a20245a 100644
--- a/classlib/modules/sql/make/run-test.xml
+++ b/classlib/modules/sql/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/suncompat/make/run-test.xml b/classlib/modules/suncompat/make/run-test.xml
index f6fba49..7bc3149 100644
--- a/classlib/modules/suncompat/make/run-test.xml
+++ b/classlib/modules/suncompat/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/swing/make/run-test.xml b/classlib/modules/swing/make/run-test.xml
index 5042ed4..7c3408a 100644
--- a/classlib/modules/swing/make/run-test.xml
+++ b/classlib/modules/swing/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/text/make/run-test.xml b/classlib/modules/text/make/run-test.xml
index 4fe49ce..6ec7a9f 100644
--- a/classlib/modules/text/make/run-test.xml
+++ b/classlib/modules/text/make/run-test.xml
@@ -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" />
diff --git a/classlib/modules/x-net/make/run-test.xml b/classlib/modules/x-net/make/run-test.xml
index f8ee0ad..4ad6b4b 100644
--- a/classlib/modules/x-net/make/run-test.xml
+++ b/classlib/modules/x-net/make/run-test.xml
@@ -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" />
diff --git a/common_resources/make/testproperties.xml b/common_resources/make/testproperties.xml
new file mode 100644
index 0000000..a55860d
--- /dev/null
+++ b/common_resources/make/testproperties.xml
@@ -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>
diff --git a/jdktools/modules/jdktools/make/run-test.xml b/jdktools/modules/jdktools/make/run-test.xml
index 87c6dfd..2f1d243 100644
--- a/jdktools/modules/jdktools/make/run-test.xml
+++ b/jdktools/modules/jdktools/make/run-test.xml
@@ -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" />
diff --git a/jdktools/modules/jpda/make/run-test.xml b/jdktools/modules/jpda/make/run-test.xml
index 86f76c4..28f8499 100644
--- a/jdktools/modules/jpda/make/run-test.xml
+++ b/jdktools/modules/jpda/make/run-test.xml
@@ -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" />
diff --git a/jdktools/modules/jretools/make/run-test.xml b/jdktools/modules/jretools/make/run-test.xml
index b8ed5cf..ab94781 100644
--- a/jdktools/modules/jretools/make/run-test.xml
+++ b/jdktools/modules/jretools/make/run-test.xml
@@ -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" />
diff --git a/jdktools/modules/samsa/make/run-test.xml b/jdktools/modules/samsa/make/run-test.xml
index a2d6164..49dc2bd 100644
--- a/jdktools/modules/samsa/make/run-test.xml
+++ b/jdktools/modules/samsa/make/run-test.xml
@@ -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" />
