harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r786074 [1/2] - in /harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/accessibility/make/ modules/annotation/ modules/annotation/make/ modules/applet/ modules/applet/make/ modules/archive/ modules/archive/make/ modules/a...
Date Thu, 18 Jun 2009 14:17:26 GMT
Author: hindessm
Date: Thu Jun 18 14:17:24 2009
New Revision: 786074

URL: http://svn.apache.org/viewvc?rev=786074&view=rev
Log:
Make test output location variable name consistent.
Split test task so that processing can be invoked separately.

Modified:
    harmony/enhanced/classlib/trunk/make/build-test.xml
    harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    harmony/enhanced/classlib/trunk/modules/annotation/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/applet/build.xml
    harmony/enhanced/classlib/trunk/modules/applet/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/beans/build.xml
    harmony/enhanced/classlib/trunk/modules/beans/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    harmony/enhanced/classlib/trunk/modules/jndi/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/logging/build.xml
    harmony/enhanced/classlib/trunk/modules/logging/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/math/build.xml
    harmony/enhanced/classlib/trunk/modules/math/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/pack200/build.xml
    harmony/enhanced/classlib/trunk/modules/pack200/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/regex/build.xml
    harmony/enhanced/classlib/trunk/modules/regex/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/security/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/sound/build.xml
    harmony/enhanced/classlib/trunk/modules/sound/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/sql/build.xml
    harmony/enhanced/classlib/trunk/modules/sql/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml
    harmony/enhanced/classlib/trunk/modules/x-net/make/hyproperties.xml

Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Thu Jun 18 14:17:24 2009
@@ -39,8 +39,10 @@
 
     <!-- this list of components to test will grow to eventually be all modules -->
     <target name="test-all"
-        depends="clean-test-output, test-modules, process-empty, gen-report, check-test-result">
-    </target>
+            depends="clean-test-output, test-modules, process-test-output" />
+
+    <target name="process-test-output"
+            depends="process-empty, gen-report, check-test-result" />
 
     <target name="clean">
         <delete dir="${tests.output}" />

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -169,7 +171,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -193,7 +195,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+            <batchtest todir="${tests.output}" haltonfailure="no">
 
                 <fileset dir="${hy.accessibility.src.test.api}/java/common">
                     <!-- if ${test.case}     -->
@@ -209,12 +211,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">accessibility${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">accessibility${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -149,7 +151,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -176,7 +178,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.annotation.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -192,12 +194,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">annotation${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">annotation${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/annotation/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -148,7 +150,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -174,7 +176,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.applet.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -190,12 +192,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">applet${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">applet${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/applet/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -294,7 +296,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -326,7 +328,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.archive.src.test.internal}">
                     <!-- if ${test.case}     -->
@@ -366,7 +368,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.archive.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -382,12 +384,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">archive${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">archive${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/archive/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -44,7 +44,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Thu Jun 18 14:17:24 2009
@@ -24,6 +24,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -202,7 +204,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -235,7 +237,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.auth.src.test.java.platform}">
                     <!-- if ${test.case}     -->
@@ -261,12 +263,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">auth${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">auth${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -43,7 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -384,7 +386,7 @@
     </target>
 
     <target name="run-tests">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <!-- bootclasspath tests -->
@@ -407,7 +409,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+            <batchtest todir="${tests.output}" haltonfailure="no">
                 <fileset dir="${hy.awt.src.test.impl.boot}">
                     <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Test.java" unless="test.case" />
@@ -442,7 +444,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}">
+            <batchtest todir="${tests.output}">
                 <fileset dir="${hy.awt.src.test.api.java}">
                     <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Test.java" unless="test.case" />
@@ -479,7 +481,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
                 <fileset dir="${hy.awt.src.test.impl.boot}">
                     <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Headless*Test.java" unless="test.case" />
@@ -499,12 +501,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">awt${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">awt${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -52,7 +52,4 @@
     <jdk location="../../deploy/jdk"/>
     <build location="../../build/classes"/>
     
-    <tests>
-        <reports location="../../build/test_report"/>
-    </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -198,7 +200,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -231,7 +233,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.beans.src.test.internal}">
                     <!-- if ${test.case}     -->
@@ -272,7 +274,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.beans.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -288,12 +290,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">beans${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">beans${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -46,7 +46,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -142,7 +144,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -169,7 +171,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
                 <fileset dir="${hy.concurrent.src.test.java}">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -184,12 +186,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">concurrent${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">concurrent${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -184,7 +186,7 @@
                     <pathelement path="../../build/tests" />
                 </classpath>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -202,7 +204,7 @@
                 <!-- to pick up junit.jar               -->
                 <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/api.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/api/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -227,7 +229,7 @@
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
                 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/impl/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -245,7 +247,7 @@
                 <!-- to pick up junit.jar               -->
                 <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests"/>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/impl/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -263,12 +265,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">crypto${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">crypto${line.separator}</echo>
     </target>
     
@@ -309,7 +311,7 @@
         <sequential>
             <echo message="Running CRYPTO @{description}" />
 
-            <mkdir dir="${hy.tests.reports}" />
+            <mkdir dir="${tests.output}" />
 
             <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -193,7 +195,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -219,7 +221,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.imageio.src.test.java}" >
                     <!-- if ${test.case}     -->
@@ -235,12 +237,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">imageio${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">imageio${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -177,7 +179,7 @@
     
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -206,7 +208,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.instrument.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -222,12 +224,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">instrument${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">instrument${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -152,7 +154,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -181,7 +183,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.jndi.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -198,7 +200,7 @@
                 </fileset>
             </batchtest>
             
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
                 <fileset dir="${hy.jndi.src.test.java}">
@@ -206,7 +208,7 @@
                 </fileset>
             </batchtest>
             
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
                 <fileset dir="${hy.jndi.src.test.java}">
@@ -214,7 +216,7 @@
                 </fileset>
             </batchtest>            
             
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
                 <fileset dir="${hy.jndi.src.test.java}">
@@ -228,12 +230,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">jndi${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">jndi${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/jndi/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -169,7 +171,7 @@
     <target name="run-tests" depends="run-tests-api,run-tests-impl" />
 
     <target name="run-tests-api">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -196,7 +198,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
                 <fileset dir="${hy.lang-management.src.test.api.java}" >
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -211,7 +213,7 @@
     </target>
 
     <target name="run-tests-impl">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -238,7 +240,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
                 <fileset dir="${hy.lang-management.src.test.impl.java}">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -253,11 +255,11 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures" append="true">lang-management${line.separator}</echo>
+        <echo file="${tests.output}/test.failures" append="true">lang-management${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors" append="true">lang-management${line.separator}</echo>
+        <echo file="${tests.output}/test.errors" append="true">lang-management${line.separator}</echo>
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -50,7 +50,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -164,7 +166,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -203,7 +205,7 @@
             <formatter type="xml" />
 
             <!-- run LogManagerTest in separated VM -->
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                 unless="test.case">
 
                 <fileset dir="${hy.logging.src.test.java}">
@@ -212,7 +214,7 @@
                 </fileset>
             </batchtest>
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.logging.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -230,12 +232,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">logging${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">logging${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/logging/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -43,7 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -391,7 +393,7 @@
                     </fileset>
                 </classpath>
  
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.luni.src.test.api}/common">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -425,7 +427,7 @@
                         <include name="*.jar" />
                     </fileset>
                 </classpath>
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                    <fileset dir="${hy.luni.src.test.impl}/common">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -450,12 +452,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">luni${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">luni${line.separator}</echo>
     </target>
 
@@ -512,7 +514,7 @@
         <sequential>
             <echo message="Running LUNI @{description}" />
 
-            <mkdir dir="${hy.tests.reports}" />
+            <mkdir dir="${tests.output}" />
 
             <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -46,10 +46,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-      <support>
-          <bin location="../../build/tests" />
-      </support>
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -151,7 +153,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -178,7 +180,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.math.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -194,12 +196,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">math${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">math${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/math/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -178,7 +180,7 @@
     </target>
 
     <target name="run-tests">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
         <junit fork="yes"
@@ -205,7 +207,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.misc.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -221,12 +223,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">misc${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">misc${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/misc/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -43,7 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -198,7 +200,7 @@
     </target>
 
     <target name="run-tests">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -225,7 +227,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+            <batchtest todir="${tests.output}" haltonfailure="no">
                 <fileset dir="${hy.nio.src.test.java}">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -249,11 +251,11 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures" append="true">nio${line.separator}</echo>
+        <echo file="${tests.output}/test.failures" append="true">nio${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors" append="true">nio${line.separator}</echo>
+        <echo file="${tests.output}/test.errors" append="true">nio${line.separator}</echo>
     </target>
 
     <target name="copy-test-resources">

Modified: harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Thu Jun 18 14:17:24 2009
@@ -25,6 +25,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -186,7 +188,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -217,7 +219,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.nio_char.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -233,12 +235,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">nio_char${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">nio_char${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -45,7 +45,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Thu Jun 18 14:17:24 2009
@@ -26,6 +26,8 @@
     <import file="${hy.hdk}/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -199,7 +201,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -229,7 +231,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.pack200.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -245,12 +247,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">pack200${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">pack200${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -44,7 +44,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -197,7 +199,7 @@
     </target>
 
     <target name="-make-report-dir">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
     </target>
 
     <target name="-compile-native-tests" if="test.portlib">
@@ -238,7 +240,7 @@
         <exec-native test="hyipcmutex" />
         <exec-native test="hymmap" />
 	
-        <move todir="${hy.tests.reports}">
+        <move todir="${tests.output}">
             <fileset dir="${hy.portlib}">
                 <include name="TEST-*.xml"/>
             </fileset>
@@ -279,7 +281,7 @@
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">portlib${line.separator}</echo>
     </target>
 
@@ -311,7 +313,7 @@
                 </not>
             </condition>
             <echo>@{test}: ${@{test}.result}${line.separator}</echo>
-<!--            <echo file="${hy.tests.reports}/TEST-${@{test}.name}.xml"
+<!--            <echo file="${tests.output}/TEST-${@{test}.name}.xml"
                  >&lt;?xml version='1.0' encoding='UTF-8' ?&gt;
 &lt;testsuite tests="1" errors='${@{test}.errorcount}' failures='0'
     name='${@{test}.name}' time='0'&gt;

Modified: harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -45,10 +45,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-      <support>
-          <bin location="../../build/tests" />
-      </support>
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Thu Jun 18 14:17:24 2009
@@ -25,6 +25,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -181,7 +183,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -209,7 +211,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.prefs.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -225,12 +227,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">prefs${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">prefs${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -43,7 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -199,7 +201,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -227,7 +229,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+            <batchtest todir="${tests.output}" haltonfailure="no">
 
                 <fileset dir="${hy.print.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -246,12 +248,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">print${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">print${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Thu Jun 18 14:17:24 2009
@@ -24,6 +24,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -153,7 +155,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -182,7 +184,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.regex.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -198,12 +200,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">regex${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">regex${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/regex/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -43,7 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -152,7 +154,7 @@
                     <pathelement path="../../build/tests"/>
                 </classpath>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.rmi.src.test}/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -170,12 +172,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">rmi${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">rmi${line.separator}</echo>
     </target>
 
@@ -217,7 +219,7 @@
         <sequential>
             <echo message="Running RMI @{description}" />
 
-            <mkdir dir="${hy.tests.reports}" />
+            <mkdir dir="${tests.output}" />
 
             <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/classlib/trunk/modules/rmi/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -291,7 +293,7 @@
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.security.src.test}/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -309,7 +311,7 @@
                 <!-- to pick up junit.jar               -->
                 <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.security.src.test}/api/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -335,7 +337,7 @@
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
                 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.security.src.test}/impl/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -353,7 +355,7 @@
                 <!-- to pick up junit.jar               -->
                 <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl_in.jar${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.security.src.test}/impl/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -371,12 +373,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">security${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">security${line.separator}</echo>
     </target>
 
@@ -417,7 +419,7 @@
         <sequential>
             <echo message="Running SECURITY @{description}" />
 
-            <mkdir dir="${hy.tests.reports}" />
+            <mkdir dir="${tests.output}" />
 
             <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/classlib/trunk/modules/security/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -163,7 +165,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -190,7 +192,7 @@
             <classpath location="${hy.hdk}/build/test/resources/sound/org/apache/harmony/sound/tests/javax/sound/sampled/soundProvider.jar" />
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.sound.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -206,12 +208,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">sound${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">sound${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/sound/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -150,7 +152,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -180,7 +182,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.sql.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -196,12 +198,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">sql${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">sql${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/sql/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Thu Jun 18 14:17:24 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -149,7 +151,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -176,7 +178,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.suncompat.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -192,12 +194,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">suncompat${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">suncompat${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml Thu Jun 18 14:17:24 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>



Mime
View raw message