harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r786074 [2/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
Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/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" />
 
@@ -180,7 +182,7 @@
 
     <target name="run-tests" depends="compile-tests,copy-test-resources">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -205,7 +207,7 @@
             <jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
 <!--            <jvmarg value="-Djava2d.opengl=true"/> -->
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.swing.src.test.api}/java.injected">
                     <!-- 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">swing${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">swing${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/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/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/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.text.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">text${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">text${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml Thu Jun 18 14:17:24
2009
@@ -42,10 +42,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/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/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" />
 
@@ -174,7 +176,7 @@
                     <pathelement path="../../build/tests" />
                 </classpath>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.x-net.src.test}/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -199,7 +201,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.x-net.src.test}/impl/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -216,7 +218,7 @@
                 <!-- to pick up junit.jar               -->
                 <jvmarg value="-Xbootclasspath/a:${hy.x-net.bin.test}/impl.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.x-net.src.test}/impl/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -234,12 +236,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">x-net${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">x-net${line.separator}</echo>
     </target>
     
@@ -280,7 +282,7 @@
         <sequential>
             <echo message="Running X-NET @{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/x-net/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/make/hyproperties.xml?rev=786074&r1=786073&r2=786074&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/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