harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r786099 - in /harmony/enhanced/jdktools/trunk: make/ modules/jdktools/ modules/jdktools/make/ modules/jpda/ modules/jpda/make/ modules/jretools/ modules/jretools/make/ modules/samsa/ modules/samsa/make/
Date Thu, 18 Jun 2009 14:57:38 GMT
Author: hindessm
Date: Thu Jun 18 14:57:38 2009
New Revision: 786099

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

Modified:
    harmony/enhanced/jdktools/trunk/make/build-test.xml
    harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
    harmony/enhanced/jdktools/trunk/modules/jdktools/make/hyproperties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml
    harmony/enhanced/jdktools/trunk/modules/jretools/build.xml
    harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/make/hyproperties.xml

Modified: harmony/enhanced/jdktools/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-test.xml?rev=786099&r1=786098&r2=786099&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-test.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-test.xml Thu Jun 18 14:57:38 2009
@@ -19,7 +19,7 @@
 
 <project name="jdktools-test" default="test-all" basedir="..">
 
-    <description> Tests for classlib package</description>
+    <description>Tests for classlib package</description>
 
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
@@ -37,8 +37,10 @@
 
     <!-- this list of components to test will grow to eventually be all modules -->
     <target name="test-all"
-        depends="clean-tests-output, test-modules, process-empty, gen-report, check-test-result">
-    </target>
+        depends="clean-tests-output, test-modules, process-test-output" />
+
+    <target name="process-test-output"
+            depends="process-empty, gen-report, check-test-result" />
 
     <target name="clean" depends="clean-tests-output, clean-tests, clean-jre" />
 

Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml?rev=786099&r1=786098&r2=786099&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml Thu Jun 18 14:57:38 2009
@@ -23,6 +23,8 @@
     <property name="tests.build.output" location="../../build/tests" />
     <import file="${basedir}/../../make/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -190,7 +192,7 @@
         <echo message="Running TOOLS tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <junit fork="yes"
                        forkmode="${hy.test.forkmode}"
@@ -199,7 +201,7 @@
                        errorproperty="test.errors"
                        failureproperty="test.failures"
                        showoutput="on"
-                       dir="${hy.tests.reports}"
+                       dir="${tests.output}"
                        jvm="${test.jre.home}/bin/java">
 
             <jvmarg line="${hy.test.vmargs}" />
@@ -211,10 +213,10 @@
 
             <formatter type="xml" />
 
-            <test name="${test.case}" todir="${hy.tests.reports}"
+            <test name="${test.case}" todir="${tests.output}"
                               if="test.case" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                                    unless="test.case">
 
                 <fileset dir="${hy.tools.src.test.java}">
@@ -232,12 +234,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">tools${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">tools${line.separator}</echo>
     </target>
 

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

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?rev=786099&r1=786098&r2=786099&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Thu Jun 18 14:57:38 2009
@@ -23,6 +23,8 @@
     <property name="tests.build.output" location="${basedir}/../../build/tests" />
     <import file="../../make/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
     
@@ -232,7 +234,7 @@
         <echo message="  Debugger JVM=${test.debugger.jvm}" />
         <echo message="  Debuggee JVM=${test.debuggee.jvm}" />
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <junit fork="yes"
                        forkmode="${hy.test.forkmode}"
@@ -241,7 +243,7 @@
                        errorproperty="test.errors"
                        failureproperty="test.failures"
                        showoutput="off"
-                       dir="${hy.tests.reports}"
+                       dir="${tests.output}"
                        jvm="${test.debugger.jvm}">
 
             <!-- JVM arguments for debugger process -->
@@ -257,10 +259,10 @@
 
             <formatter type="xml" />
 
-            <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
+            <test name="${test.case}" todir="${tests.output}" if="test.case" />
 
             <!-- short running tests-->
-            <batchtest todir="${hy.tests.reports}" haltonfailure="off" unless="test.case">
+            <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
 
                 <fileset dir="${hy.jpda.src.test}">
                     <!-- if ${test.case}     -->
@@ -276,7 +278,7 @@
             </batchtest>
 
             <!-- long running tests-->
-            <batchtest todir="${hy.tests.reports}" haltonfailure="off" unless="test.case">
+            <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
                 <fileset dir="${hy.jpda.src.test}">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -295,12 +297,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">jpda${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">jpda${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml?rev=786099&r1=786098&r2=786099&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml Thu Jun 18 14:57:38
2009
@@ -44,10 +44,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/jdktools/trunk/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml?rev=786099&r1=786098&r2=786099&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jretools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/build.xml Thu Jun 18 14:57:38 2009
@@ -23,6 +23,8 @@
     <property name="tests.build.output" location="../../build/tests" />
     <import file="${basedir}/../../make/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -176,7 +178,7 @@
         <echo message="Running TOOLS tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <junit fork="yes"
                        forkmode="${hy.test.forkmode}"
@@ -185,7 +187,7 @@
                        errorproperty="test.errors"
                        failureproperty="test.failures"
                        showoutput="on"
-                       dir="${hy.tests.reports}"
+                       dir="${tests.output}"
                        jvm="${test.jre.home}/bin/java">
 
             <jvmarg line="${hy.test.vmargs}" />
@@ -197,10 +199,10 @@
 
             <formatter type="xml" />
 
-            <test name="${test.case}" todir="${hy.tests.reports}"
+            <test name="${test.case}" todir="${tests.output}"
                               if="test.case" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                                    unless="test.case">
 
                 <fileset dir="${hy.tools.src.test.java}">
@@ -218,12 +220,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">tools${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">tools${line.separator}</echo>
     </target>
 

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

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?rev=786099&r1=786098&r2=786099&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Thu Jun 18 14:57:38 2009
@@ -20,9 +20,12 @@
     <description>Build for samsa program</description>
 
     <!-- import common properties -->
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="../../make/properties.xml" />
 
+    <property name="hy.hdk" location="${basedir}/../../deploy" />
+
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -162,10 +165,10 @@
         <echo message="Running SAMSA tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
-        <echo message="Run jdk/bin/java -version in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/java -version in ${tests.output}"/>
         <exec failonerror="true"
 	      executable="${test.jre.home}/../bin/java${exe.suffix}"
-	      dir="${hy.tests.reports}"
+	      dir="${tests.output}"
               outputproperty="java.out.text">
 	    <arg line="-version" />
         </exec>
@@ -185,52 +188,52 @@
             </condition>
         </fail>
 
-        <echo message="Run jdk/bin/javac -version in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/javac -version in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/../bin/javac${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="-version" />
         </exec>
 
-        <echo message="Run jdk/bin/javah in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/javah in ${tests.output}"/>
         <exec failonerror="false"
 	        executable="${test.jre.home}/../bin/javah${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/bin/javadoc in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/javadoc in ${tests.output}"/>
         <exec failonerror="false"
 	        executable="${test.jre.home}/../bin/javadoc${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/bin/jarsigner in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/jarsigner in ${tests.output}"/>
         <exec failonerror="false"
 	        executable="${test.jre.home}/../bin/jarsigner${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/jre/bin/keytool -help in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/keytool -help in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/bin/keytool${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="-help" />
         </exec>
 
-        <echo message="Run jdk/jre/bin/unpack200 in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/unpack200 in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/bin/unpack200${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/jre/bin/pack200 in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/pack200 in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/bin/pack200${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/make/hyproperties.xml?rev=786099&r1=786098&r2=786099&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/make/hyproperties.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/make/hyproperties.xml Thu Jun 18 14:57:38
2009
@@ -43,10 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-      <support>
-          <bin location="../../build/tests" />
-      </support>
-   </tests>
 </hy>



Mime
View raw message